Merge remote-tracking branch 'origin/pet' into pet

取消 人员信息修改时需要手动推送(信息修改后中台自动同步到各端)

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -575,8 +575,8 @@ public class UsersController extends BaseController {
             usersService.resetCardNo(pd);
         }
         //每次人员信息更改都要将人物状态置为未推送且不可查询，需推送后在进行使用
-        pd.put("ISDELETE","1");
-        pd.put("ISPUSH","0");
+//        pd.put("ISDELETE","1");
+//        pd.put("ISPUSH","0");
         usersService.editUser(pd);    //执行修改
         if ("true".equals(pd.getString("ISSTUDENT"))) {
             pd.put("IS_ONLINELEARNING", "1");
@@ -1027,6 +1027,7 @@ public class UsersController extends BaseController {
             PageData userPd = new PageData();
             userPd.put("USER_ID",ID);
             PageData userinfo = usersService.findById(userPd);
+            userinfo.put("PHONE",userinfo.get("USERNAME"));
             userinfo.put("ISDELETE","0");
             map.put("USERINFO", userinfo);
             map.put("USER_ID",ID);