问题调整

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java

@@ -7,6 +7,8 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
 import cn.iocoder.yudao.framework.common.util.string.StrUtils;
@@ -224,6 +226,9 @@ public class AdminAuthServiceImpl implements AdminAuthService {
                 String userId = DingtalkUtil.getUserIdByUnion(socialUser.getUnionId());
                 OapiV2UserGetResponse.UserGetResponse userDetail = DingtalkUtil.getUserDetail(userId);
                 user = userService.getUserByUsername(userDetail.getJobNumber());
+                if (user == null) {
+                    throw new ServiceException(new ErrorCode(1,"请联系管理员在门户系统中开户"));
+                }
                 // 绑定钉钉
                 SocialUserBindDO newSocialUserBind = SocialUserBindDO.builder()
                         .userId(user.getId()).userType(UserTypeEnum.ADMIN.getValue())

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/admin/TodoController.java

@@ -32,6 +32,7 @@ import javax.annotation.security.PermitAll;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Tag(name = "管理后台 - 待办接口")
 @RestController
@@ -164,14 +165,14 @@ public class TodoController {
     @PermitAll
     public CommonResult<List> crmNoticeSelfSystem(String workcode) throws Exception {
         List<CrmNoticeDO> workCode = crmNoticeMapper.selectList("work_code", workcode);
-        return CommonResult.success(workCode);
+        return CommonResult.success(workCode.stream().sorted(Comparator.comparing(CrmNoticeDO::getCreatedAt).reversed()).collect(Collectors.toList()));
     }
 
     @GetMapping("/oa/notice/self")
     @PermitAll
     public CommonResult<List> oaNoticeSelfSystem(String workcode) throws Exception {
         List<OaNoticeDO> workCode = oaNoticeMapper.selectList("work_code", workcode);
-        return CommonResult.success(workCode);
+        return CommonResult.success(workCode.stream().sorted(Comparator.comparing(OaNoticeDO::getOaCreateTime).reversed()).collect(Collectors.toList()));
     }
 
     @GetMapping("/crm/notice/readed")

yudao-server/src/main/java/cn/iocoder/yudao/server/service/PortalOaFlow.java

@@ -161,13 +161,16 @@ public class PortalOaFlow {
                 "https://yfoa.keruioil.com/api/workflow/paService/getDoingWorkflowRequestList?pageNo="+pageNo+"&pageSize="+pageSize,
                 requestEntityOut1, String.class
         );
-
-        List<JSONObject> jsonObjects = JSON.parseArray(todoList, JSONObject.class);
-
+        List<JSONObject> jsonObjects = new ArrayList<>();
+        if (todoList != null && !todoList.contains("token不存在或者超时")) {
+            jsonObjects = JSON.parseArray(todoList, JSONObject.class);
+        }
         //已办明细
         String doneList = noCookieRestTemplate.postForObject("https://yfoa.keruioil.com/api/workflow/paService/getHandledWorkflowRequestList?pageNo="+pageNo+"&pageSize="+pageSize, requestEntityOut1, String.class);
-
-        List<JSONObject> doneJsonObjects = JSON.parseArray(doneList, JSONObject.class);
+        List<JSONObject> doneJsonObjects = new ArrayList<>();
+        if (todoList != null && !todoList.contains("token不存在或者超时")) {
+            doneJsonObjects = JSON.parseArray(doneList, JSONObject.class);
+        }
         return ImmutableMap.of("todoCount", out, "todoList", jsonObjects,"doneCount", done,"doneList", doneJsonObjects);
     }