yusm 1 mesiac pred
rodič
commit
d353ffe8c5

+ 10 - 3
fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.constant.Constant;
@@ -1138,7 +1139,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         }
                     }
                 }
-            } else {
+            }
+            else {
                 //修改
                 if (!StringUtils.isEmpty(phone) && userMapper.selectCount(new QueryWrapper<User>().eq("phone", phone).ne("id", targetId)) > 0) {
                     //httpRespMsg.setError("该电话号码已存在");
@@ -1163,7 +1165,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     superiorChange = true;
                 }
 
-                userMapper.updateById(oldUser
+                UpdateWrapper<User> wrapper = new UpdateWrapper<>();
+                wrapper.eq("id", oldUser.getId())
+                        .set("work_type_id", workTypeId)
+                        .set("work_type", workTypeId!=null?workTypeMapper.selectById(workTypeId).getName():null);
+
+                userMapper.update(oldUser
                         .setName(name)
                         .setGender(gender)
                         .setPhone(phone)
@@ -1187,7 +1194,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         .setPlate3(plate3)
                         .setPlate4(plate4)
                         .setPlate5(plate5)
-                        .setJobNumber(jobNumber));
+                        .setJobNumber(jobNumber),wrapper);
                 if (oldSuperiorId != null && superiorId == null) {
                     //清空直属审核人
                     userMapper.setSuperiorNull(oldUser.getId());