[修改] 权限申请对接 + 保密结束时间定时任务

adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java

@@ -25,6 +25,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -51,6 +52,7 @@ public class UserEOController extends BaseController<UserEO> {
     @Resource
     private IUserEoService userEOService;
 
+    @Autowired
     private UserOrgEODao userOrgEODao;
 
     @Value("${isPassEncrypted}")
@@ -123,15 +125,17 @@ public class UserEOController extends BaseController<UserEO> {
         userOrgEOLambdaQueryWrapper.eq(UserOrgEO::getUserId,eo.getUsid());
         userOrgEODao.delete(userOrgEOLambdaQueryWrapper);
         String orgId = eo.getOrgId();
-        String[] split = orgId.split(",");
-        List<UserOrgEO> userOrgEOS = new ArrayList<>();
-        for (String s : split) {
-            UserOrgEO userOrgEO = new UserOrgEO();
-            userOrgEO.setUserId(eo.getUsid());
-            userOrgEO.setOrgId(s);
-            userOrgEOS.add(userOrgEO);
+        if (StringUtils.isNotEmpty(orgId)){
+            String[] split = orgId.split(",");
+            List<UserOrgEO> userOrgEOS = new ArrayList<>();
+            for (String s : split) {
+                UserOrgEO userOrgEO = new UserOrgEO();
+                userOrgEO.setUserId(eo.getUsid());
+                userOrgEO.setOrgId(s);
+                userOrgEOS.add(userOrgEO);
+            }
+            userOrgEODao.insertBatch(userOrgEOS);
         }
-        userOrgEODao.insertBatch(userOrgEOS);
         return Result.success();
     }
 

adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserOrgEODao.java

@@ -1,7 +1,6 @@
 package com.adc.da.sys.dao.mysql;
 
 import com.adc.da.sys.entity.UserOrgEO;
-import com.adc.da.sys.entity.UserRoleEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;