fengji 修改用户手机号时同步修改机构手机号

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/TenantInfoDao.java

@@ -2,8 +2,11 @@ package com.ym.mec.auth.dal.dao;
 
 import com.ym.mec.auth.api.entity.TenantInfo;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 public interface TenantInfoDao extends BaseDAO<Integer, TenantInfo> {
 
     TenantInfo getOpenTenant(Integer tenantId);
+
+    void updatePhone(@Param("newPhone") String newPhone, @Param("oldPhone")String oldPhone);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/TenantInfoService.java

@@ -6,4 +6,6 @@ import com.ym.mec.common.service.BaseService;
 public interface TenantInfoService extends BaseService<Integer, TenantInfo> {
 
     TenantInfo getOpenTenant(Integer tenantId);
+
+    void updatePhone(String newPhone, String oldPhone);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/TenantInfoServiceImpl.java

@@ -23,4 +23,11 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 	public TenantInfo getOpenTenant(Integer tenantId) {
 		return tenantInfoDao.getOpenTenant(tenantId);
 	}
+
+	@Override
+	public void updatePhone(String newPhone, String oldPhone) {
+		tenantInfoDao.updatePhone(newPhone, oldPhone);
+	}
+
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.web.controller;
 
+import com.ym.mec.auth.service.TenantInfoService;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -59,6 +60,8 @@ public class UserController extends BaseController {
 	private IdGeneratorService smsCodeService;
 	@Autowired
 	private WebFeignService webFeignService;
+	@Autowired
+	private TenantInfoService tenantInfoService;
 	@Value("${message.debugMode}")
 	private boolean debugMode;
 	@Autowired
@@ -209,6 +212,7 @@ public class UserController extends BaseController {
 			return failed("手机号被占用");
 		}
 		if (smsCodeService.verifyValidCode(newPhone, authCode)) {
+			tenantInfoService.updatePhone(newPhone, oldPhone);
 			sysUser.setPhone(newPhone);
 			sysUser.setUpdateTime(new Date());
 			sysUserService.update(sysUser);

mec-auth/mec-auth-server/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -73,8 +73,11 @@
 		</set>
 		WHERE id_ = #{id}
 	</update>
+    <update id="updatePhone">
+		update tenant_info set phone_ = #{newPhone} where phone_ = #{oldPhone}
+	</update>
 
-	<!-- 根据主键删除一条记录 -->
+    <!-- 根据主键删除一条记录 -->
 	<delete id="delete">
 		DELETE FROM tenant_info WHERE id_ = #{id}
 	</delete>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantInfoDao.java

@@ -18,4 +18,6 @@ public interface TenantInfoDao extends BaseMapper<TenantInfo> {
     TenantInfo getOpenTenant(Integer tenantId);
 
     TenantInfo queryTenantInfoByOrgan(@Param("organId") Integer organId);
+
+    void updatePhone(@Param("newPhone")String newPhone, @Param("oldPhone")String oldPhone);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/TenantInfoService.java

@@ -63,4 +63,5 @@ public interface TenantInfoService extends IService<TenantInfo> {
 
     Boolean testEmail();
 
+    void updatePhone(String newPhone, String oldPhone);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -139,6 +139,13 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				sysUser = sysUserFeignService.queryUserInfo();
 			}
 		}
+
+		// 同步更新机构手机号 如果它存在  138xxx -> 159xxx
+		SysUser user = sysUserFeignService.queryUserById(employee.getId());
+		if (!Objects.equals(user.getPhone(), employee.getPhone())) {
+			tenantInfoService.updatePhone(employee.getPhone(), user.getPhone());
+		}
+
 		employeeDao.update(employee);
 		//删除当前用户角色
 		employeeDao.delEmployeeRole(employee.getId());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -107,6 +107,8 @@ public class StudentManageServiceImpl implements StudentManageService {
     private SysTenantConfigService sysTenantConfigService;
     @Autowired
     private SysEmployeePositionService employeePositionService;
+    @Autowired
+    private TenantInfoService tenantInfoService;
 
     @Override
     public PageInfo<StudentManageListDto> findStudentsByOrganId(StudentManageQueryInfo queryInfo) {
@@ -740,6 +742,9 @@ public class StudentManageServiceImpl implements StudentManageService {
         student.setOperatingTempTag(0);
         student.setServiceTag(student.getServiceTag() == 0 ? 2 : 1);
         student.setTeacherId(student.getTeacherId());
+        // 同步更新机构手机号 如果它存在
+        SysUser user = sysUserFeignService.queryUserById(student.getId());
+        tenantInfoService.updatePhone(student.getPhone(), user.getPhone());
         activityUserMapperDao.updateTeacherId(student.getUserId(),student.getTeacherId());
         if(Objects.nonNull(student.getCarePackage())||Objects.nonNull(student.getComeOnPackage())){
             Student oldStudent = studentDao.get(userId);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -356,7 +356,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (triggerTime == null || date.after(triggerTime)) {
 			status = SendStatusEnum.SENDING;
 			try {
-				debugMode = false;
+				// debugMode = false;
 				if (debugMode == true
 						|| messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
 								MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,"default",null)) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -20,6 +20,7 @@ import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.page.*;
 
+import com.ym.mec.biz.service.TenantInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,7 +101,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	private RedisTemplate<String,String> redisTemplate;
 	@Autowired
 	private CloudTeacherDao cloudTeacherDao;
-
+	@Autowired
+	private TenantInfoService tenantInfoService;
 
 	@Override
 	public BaseDAO<Integer, Teacher> getDAO() {
@@ -162,12 +164,20 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		if(null==teacher1){
 			throw new BizException("教师信息不存在");
 		}
+
 		if(StringUtils.isNotEmpty(teacher.getPhone())){
 			SysUser sysUser = sysUserFeignService.queryUserByMobile(teacher.getPhone());
 			if(sysUser != null && !sysUser.getId().equals(teacher.getId())){
 				throw new BizException("手机号已存在");
 			}
 		}
+
+		// 同步更新机构手机号 如果它存在
+		SysUser user = sysUserFeignService.queryUserById(teacher.getId()); // 138 -> 159
+		if (!Objects.equals(user.getPhone(), teacher1.getPhone())) {
+			tenantInfoService.updatePhone(teacher1.getPhone(), user.getPhone());
+		}
+
 		if(Objects.nonNull(teacher.getEntryDate())&&Objects.nonNull(teacher.getFormalStaffDate())){
 			if(teacher.getEntryDate().compareTo(teacher.getFormalStaffDate())>0){
 				throw new BizException("入职日期不可晚于转正日期");
@@ -196,6 +206,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 				throw new BizException("手机号已存在");
 			}
 		}
+		// 同步更新机构手机号 如果它存在
+		SysUser user = sysUserFeignService.queryUserById(teacher.getId());
+		if (!Objects.equals(user.getPhone(), teacher1.getPhone())) {
+			tenantInfoService.updatePhone(teacher1.getPhone(), user.getPhone());
+		}
+
 		if(Objects.nonNull(teacher.getEntryDate())&&Objects.nonNull(teacher.getFormalStaffDate())){
 			if(teacher.getEntryDate().compareTo(teacher.getFormalStaffDate())>0){
 				throw new BizException("入职日期不可晚于转正日期");

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -782,6 +782,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         if (StringUtils.isNotEmpty(tenantId)) {
             TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
             if (Integer.parseInt(tenantId) != -1) {
+                log.info("==> " + request.getRequestURL());
                 TenantInfo tenantInfo = this.baseMapper.getOpenTenant(Integer.parseInt(tenantId));
                 if (tenantInfo != null) {
                     request.setAttribute("datasourceId", tenantInfo.getDataSource());
@@ -793,6 +794,11 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     }
 
     @Override
+    public void updatePhone(String newPhone, String oldPhone) {
+        baseMapper.updatePhone(newPhone, oldPhone);
+    }
+
+    @Override
     public TenantInfo queryTenantInfoByOrgan(Integer organId) {
         return baseMapper.queryTenantInfoByOrgan(organId);
     }

mec-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -32,6 +32,9 @@
         data_source_, pay_state_, state_, created_by_, created_time_, updated_by_, updated_time_, tsign_code_, tsign_name_,
         area_id_,user_id_
     </sql>
+    <update id="updatePhone">
+        update tenant_info set phone_ = #{newPhone} where phone_ = #{oldPhone}
+    </update>
 
     <resultMap id="TenantInfoInfoResult" type="com.ym.mec.biz.dal.vo.TenantInfoInfoPageVo">
         <!--  机构基础信息-->