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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/GlobalExceptionHandler.java

@@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
 @Primary
 public class GlobalExceptionHandler {
 
-	 @Value ("${exception.debug}")
+	@Value("${exception.debug:false}")
 	private boolean debug;
 
 	/**
@@ -48,6 +48,7 @@ public class GlobalExceptionHandler {
 		response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
 		response.setTraceId(RequestContext.getTraceId());
 		response.setPath(request.getServletPath());
+		if (debug) {
 			// 获取异常的堆栈跟踪信息
 			StringWriter sw = new StringWriter();
 			PrintWriter pw = new PrintWriter(sw);
@@ -55,6 +56,10 @@ public class GlobalExceptionHandler {
 			String stackTrace = sw.toString();
 			response.setDevMessage(stackTrace);
 			response.setMessage(stackTrace);
+		} else {
+			response.setDevMessage(e.getMessage());
+			response.setMessage(e.getMessage());
+		}
 		return response;
 	}
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PersonnelBusinessMapper.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,4 +44,8 @@ public interface PersonnelBusinessMapper extends BaseMapper<PersonnelBusiness> {
     void deleteSueByUserId(String userId);
 
     void deleteAliByUserId(String userId);
+
+    List<String> selectHygfTableName();
+
+    int countByUserId(@Param("tableName") String tableName, @Param("userId")String userId);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PersonnelBusinessMapper.xml

@@ -148,4 +148,14 @@ select  ORG_CODE orgCode from  privilege_company  where privilege_company.SEQUEN
         DELETE FROM auth_login_info WHERE USER_ID=#{userId}
     </select>
 
+    <select id="selectHygfTableName" resultType="java.lang.String">
+        SELECT table_name
+        FROM information_schema.tables
+        WHERE table_schema=DATABASE() and table_name LIKE 'hygf_%';
+    </select>
+
+    <select id="countByUserId" resultType="int">
+        select count(1) from ${tableName} where rec_user_id =#{userId}
+    </select>
+
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java

@@ -498,10 +498,21 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteAllBySequenceNbr(Long sequenceNbr) {
-        try {
-//        根据sequenceNbr查询用户userId
+        //        根据sequenceNbr查询用户userId
         String userId = personnelBusinessMapper.selectUserInfo(sequenceNbr);
+        //添加校验，如果业务表里面有相关的用户id不能删除
+        List<String> tableName = personnelBusinessMapper.selectHygfTableName();
+        if (CollectionUtil.isNotEmpty(tableName)) {
+            for (String table : tableName) {
+                int count = personnelBusinessMapper.countByUserId(table, userId);
+                if (count > 0) {
+                    throw new BadRequest("该用户有操作记录无法删除！");
+                }
+            }
+        }
+        try {
 //        删除privilege_agency_user表中数据
             personnelBusinessMapper.deletePauByUserId(userId);
 //        删除privilege_group_user表中数据

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

+exception.debug=true
 ## DB properties:
 spring.datasource.dynamic.primary= mysql-service
 spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver