修改手机号，机构手机号同步修改

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -189,4 +189,6 @@ public interface SysUserDao extends BaseDAO<Long, SysUser> {
     SysUser getCustomerServiceByFriendLeast();
 
     void updateNameAndImg(@Param("userId") Long userId);
+
+    void updateTenantPhone(@Param("id") Long id, @Param("phone") String phone);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -229,4 +229,7 @@ public interface SysUserService extends BaseService<Long, SysUser> {
 
 
     void updateStudentHideFlag(Long userId, int hideFlag);
+
+
+    void updateUser(SysUser sysUser);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -142,8 +142,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateBaseInfo(SysUser sysUser) {
         sysUserDao.update(sysUser);
+        if (StringUtils.isNotBlank(sysUser.getPhone())) {
+            sysUserDao.updateTenantPhone(sysUser.getId(), sysUser.getPhone());
+        }
     }
 
     @Override
@@ -478,4 +482,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     public void updateStudentHideFlag(Long userId, int hideFlag) {
         sysUserDao.updateStudentHideFlag(userId, hideFlag);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateUser(SysUser sysUser) {
+        this.update(sysUser);
+        // 更新机构手机号
+        if (StringUtils.isNotBlank(sysUser.getPhone())) {
+            sysUserDao.updateTenantPhone(sysUser.getId(), sysUser.getPhone());
+        }
+    }
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -141,7 +141,7 @@ public class UserController extends BaseController {
     @PostMapping(value = "/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)
     public HttpResponseResult<Boolean> updateSysUser(@RequestBody SysUser user) {
         user.setUpdateTime(new Date());
-        sysUserService.update(user);
+        sysUserService.updateUser(user);
         return HttpResponseResult.succeed(true);
     }
 
@@ -316,7 +316,7 @@ public class UserController extends BaseController {
         if (smsCodeService.verifyValidCode(newPhone, authCode, "SMS_VERIFY_CODE_UPDATE_PHONE")) {
             sysUser.setPhone(newPhone);
             sysUser.setUpdateTime(new Date());
-            sysUserService.update(sysUser);
+            sysUserService.updateUser(sysUser);
             return succeed();
         } else {
             return failed("验证码错误");

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -410,4 +410,8 @@
         update sys_user set bak_username_ = username_,username_ = concat('账号已注销',id_)
                           ,avatar_ = (select param_value_ from sys_config where param_name_ = 'logoff_img') where id_= #{userId};
     </update>
+
+    <update id="updateTenantPhone">
+        update tenant_info set phone_ = #{phone} where user_id_ = #{id}
+    </update>
 </mapper>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantInfoMapper.java

@@ -67,4 +67,6 @@ public interface TenantInfoMapper extends BaseMapper<TenantInfo> {
 	String queryTeacherCount(@Param("id") Long id);
 
     void updateIdPhone(@Param("newId") Long newId, @Param("phone") String phone, @Param("oldId") Long oldId);
+
+    void updatePhoneByUserId(@Param("userId") Long userId, @Param("phone") String phone);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TenantInfoService.java

@@ -103,4 +103,7 @@ public interface TenantInfoService extends IService<TenantInfo>  {
     Boolean updateTenantInfo(TenantInfo tenantInfo, Long tenantId);
 
     Boolean updateSysUser(SysUser sysUser, Long id);
+
+
+    void updatePhoneByUserId(Long userId, String phone);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/EmployeeServiceImpl.java

@@ -10,10 +10,7 @@ import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.service.EmployeeService;
-import com.yonge.cooleshow.biz.dal.service.StudentService;
-import com.yonge.cooleshow.biz.dal.service.SysConfigService;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
 import com.yonge.cooleshow.biz.dal.vo.EmployeeVo;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
@@ -51,6 +48,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
     @Autowired
     private StudentService studentService;
 
+    @Autowired
+    private TenantInfoService tenantInfoService;
+
     @Override
     public BaseDAO<Long, Employee> getDAO() {
         return employeeDao;
@@ -134,6 +134,11 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
         sysUser.setGender(param.getGender().getCode());
         employeeDao.updateSysUser(sysUser);
 
+
+        // 如果有机构管理员信息，更新机构管理员信息
+        tenantInfoService.updatePhoneByUserId(sysUser.getId(),sysUser.getPhone());
+
+
         employeeDao.delEmployeeRole(employee.getUserId());
         employeeDao.batchAddEmployeeRole(employee.getUserId(), param.getRoleIds());
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -1021,6 +1021,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 String newPassword = MessageFormat.format("klx{0}", studentInfo.getPhone().substring(7));
                 sysUser.setPassword(new BCryptPasswordEncoder().encode(newPassword));
             }
+
+            // 如果有机构管理员信息，更新机构管理员信息
+            tenantInfoService.updatePhoneByUserId(sysUser.getId(),studentInfo.getPhone());
             sysUserMapper.updateById(sysUser);
             return sysUser;
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -614,6 +614,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         sysUser = getUserDetil(sysUser, teacherSubmitReq);
         sysUser.setUpdateTime(new Date());
         employeeDao.updateSysUser(sysUser);
+
+        // 如果有机构管理员信息，更新机构管理员信息
+        tenantInfoService.updatePhoneByUserId(sysUser.getId(),teacherSubmitReq.getPhone());
         return sysUser;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantInfoServiceImpl.java

@@ -656,6 +656,15 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
         return true;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updatePhoneByUserId(Long userId, String phone) {
+        if (StringUtils.isNotBlank(phone)) {
+            tenantInfoMapper.updatePhoneByUserId(userId, phone);
+        }
+
+    }
+
 
     /**
      * 匹配地区码与省市区

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -228,5 +228,9 @@
 
     </select>
 
-
+    <update id="updatePhoneByUserId">
+        update tenant_info
+        set phone_ = #{phone}
+        where user_id_ = #{userId}
+    </update>
 </mapper>