F

application/src/main/java/com/lyg/application/controller/UploadController.java

@@ -124,7 +124,7 @@ public class UploadController extends BaseController {
     @GetMapping("/as/holiday")
     public void promptWarning() throws Exception {
 
-        taRotationService.selectGetWaring();
+//        taRotationService.selectGetWaring();
 //        taMandatoryLeaveService.selectGetPrompt();
 
     }

application/src/main/java/com/lyg/application/service/impl/TaRotationServiceImpl.java

@@ -144,59 +144,7 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
 
     @Override
     public void selectGetWaring() {
-//
-////预警 消息
-//        List<TaRotation> earlyWaringList = baseMapper.waring(localDate);
-//
-//        if (!earlyWaringList.isEmpty()) {
-//            for (TaRotation item : earlyWaringList) {
-//                TaMessage taMessage = new TaMessage();
-//                String uuid = StringUtil.UUID();
-//                taMessage.setMessageId(uuid);
-//                taMessage.setSourceId(item.getRotationId());
-//                StringBuilder sb = new StringBuilder(warningTmp);
-//                sb.insert(Constants.numI, item.getEmployeeNum());
-//                Integer i = item.getEmployeeNum().length() + Constants.nameI;
-//                sb.insert(i, item.getEmployeeName());
-//                taMessage.setContentSent(sb.toString());
-//                taMessage.setSourceName("taRotation");
-//                taMessage.setWaringType("waring");
-//
-//                Long count = taMessageService.countBy("source_id", item.getRotationId(), true);
-//                if (count == 0) {
-//                    taMessageMapper.insert(taMessage);
-//                    insertIntoTaSending(item.getCreateUser(), uuid);
-//                }
-//
-//            }
-//        }
-////提示消息
-//        List<TaRotation> earlyPromptList = baseMapper.prompt(localDate);
-//
-//        if (earlyPromptList.size() != 0) {
-//            for (TaRotation item : earlyPromptList) {
-//                TaMessage taMessage = new TaMessage();
-//                String uuid = StringUtil.UUID();
-//                taMessage.setMessageId(uuid);
-//                taMessage.setSourceId(item.getRotationId());
-//                StringBuilder sb = new StringBuilder(promptTmp);
-//                sb.insert(Constants.numI, item.getEmployeeNum());
-//                Integer i = item.getEmployeeNum().length() + Constants.nameI;
-//                sb.insert(i, item.getEmployeeName());
-//                taMessage.setContentSent(sb.toString());
-//                taMessage.setSourceName("taRotation");
-//                taMessage.setWaringType("prompt");
-//
-//                Long count = taMessageService.countBy("source_id", item.getRotationId(), true);
-//                if (count == 0) {
-//                    taMessageMapper.insert(taMessage);
-//                    insertIntoTaSending(item.getCreateUser(), uuid);
-//                }
-//
-//            }
-//        }
 
-//        return;
         LocalDate localDate = LocalDate.now();
 
         // 预警消息处理

application/src/main/java/com/lyg/application/util/Rule.java

@@ -51,11 +51,9 @@ public class Rule {
             if (!result.isEmpty()) {
                 isRulesCompatible = result.stream()
                         .allMatch(error -> error.getRules() != null && error.getRules().contains(COMPATIBLE_TEXT));
-
-
             }
 
-            String message = (isRulesCompatible  ? "不相容" : "相容";
+            String message = (isRulesCompatible  ? "相容" : "不相容");
 
 
                 int statusCode = 200; // HTTP状态码

application/src/main/resources/mapper/TaRotationMapper.xml

@@ -10,7 +10,7 @@
         AND r.specific_org_num != r.org_num_job_rotation
         AND r.specific_org_num=#{params.oldOrgCode}
         AND r.org_num_job_rotation=#{params.newOrgCode}
-        AND r.rotation_exe_time <=#{newDate}
+        AND r.rotation_exe_time >=#{newDate}
         AND r.counter_imp_positions IN
         <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
             #{item}
@@ -20,6 +20,8 @@
         <foreach item="item" index="index" collection="targetList" open="(" separator="," close=")">
             #{item}
         </foreach>
+        And r.counter_imp_positions != r.counter_imp_post_rotation
+
     </select>
     <select id="waring" resultType="com.lyg.application.entity.TaRotation">
         SELECT * FROM TA_ROTATION r

system/src/main/java/com/lyg/system/controller/BaseController.java

@@ -1,7 +1,6 @@
 package com.lyg.system.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lyg.common.Constants;
 import com.lyg.common.util.StringUtil;
 import com.lyg.system.entity.SysUser;
@@ -34,7 +33,8 @@ public class BaseController {
     @SneakyThrows
     public String checkAuth() {
         SysUser sysUser = currentUser();
-        if (sysUser.getIsAdmin() != 1) {
+        Integer isAdmin = sysUser.getIsAdmin();
+        if (isAdmin != 1 || isAdmin == null) {
             return sysUser.getUserId();
         }
         return null;