修改用户默认密码

Api/src/main/java/com/java110/api/listener/users/AddStaffServiceListener.java

@@ -164,7 +164,7 @@ public class AddStaffServiceListener extends AbstractServiceApiDataFlowListener{
         //设置默认密码
         String staffDefaultPassword = MappingCache.getValue(MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
         Assert.hasLength(staffDefaultPassword,"映射表中未设置员工默认密码，请检查"+MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
-
+        staffDefaultPassword = AuthenticationFactory.passwdMd5(staffDefaultPassword);
         paramObj.put("password",staffDefaultPassword);
         return paramObj;
     }

WebService/src/main/java/com/java110/web/smo/impl/StaffServiceSMOImpl.java

@@ -84,18 +84,12 @@ public class StaffServiceSMOImpl extends BaseComponentSMO implements IStaffServi
 
         String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
         responseEntity = this.callCenterService(restTemplate,pd,"",
-                ServiceConstant.SERVICE_API_URL+"/api/query.store.users?row="+rows+"&page="+page+"&storeId="+storeId, HttpMethod.GET);
+                ServiceConstant.SERVICE_API_URL+"/api/query.staff.infos?rows="+rows+"&page="+page+"&storeId="+storeId, HttpMethod.GET);
         if(responseEntity.getStatusCode() != HttpStatus.OK){
             return responseEntity;
         }
 
-        String result = "{'total':1,'page':1,'row':10,'datas':[" +
-                "{'userId':'111','name':'123','email':'928255095@qq.com','address':'张安1','sex':'男','tel':'17797173944','statusCd':'0','createTime':'2019-03-19'}," +
-                "{'userId':'111','name':'123','email':'928255095@qq.com','address':'张安2','sex':'男','tel':'17797173945','statusCd':'0','createTime':'2019-03-19'}," +
-                "{'userId':'111','name':'123','email':'928255095@qq.com','address':'张安3','sex':'男','tel':'17797173946','statusCd':'0','createTime':'2019-03-19'}" +
-                "]}";
-
-        JSONObject resultObjs = JSONObject.parseObject(result);
+        JSONObject resultObjs = JSONObject.parseObject(responseEntity.getBody().toString());
         resultObjs.put("row",rows);
         resultObjs.put("page",page);
         return responseEntity;

WebService/src/main/resources/components/add-staff/addStaff.js

@@ -30,8 +30,8 @@
                         },
                         {
                             limit:"maxin",
-                            param:"4,6",
-                            errInfo:"用户名长度必须在4位至6位"
+                            param:"2,10",
+                            errInfo:"用户名长度必须在2位至10位"
                         },
                     ],
                     'addStaffInfo.email':[

WebService/src/main/resources/components/staff/staff.html

@@ -35,7 +35,7 @@
                                 <td>{{staff.createTime}}</td>
                                 <td>
                                     <i class="glyphicon glyphicon-edit" style="color: #17a2b8;"></i>
-                                    <i class="glyphicon glyphicon-remove-sign" style="color: #dc3545;margin-left:5px"></i>
+                                    <i v-if="staff.relCd != 600311000001" class="glyphicon glyphicon-remove-sign" style="color: #dc3545;margin-left:5px"></i>
                                 </td>
                             </tr>
                         </tbody>

WebService/src/main/resources/components/staff/staff.js

@@ -18,7 +18,10 @@
             methods:{
                 loadData:function(){
                     var param = {
-                        msg:'123',
+                        params:{
+                            page:1,
+                            rows:10
+                        }
                     };
 
                     //发送get请求
@@ -44,7 +47,10 @@
                 },
                 addStaff:function(){
                     var param = {
-                        msg:123
+                        params:{
+                            page:1,
+                            rows:10
+                        }
                     };
                       //发送get请求
                    vc.http.post('nav',