Merge remote-tracking branch 'origin/main'

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/attentiontodo/AttentiontodoServiceImpl.java

@@ -59,7 +59,7 @@ public class AttentiontodoServiceImpl implements AttentiontodoService {
         attentiontodoMapper.deleteall(updateReqVO);
         if(updateReqVO.getTaskDispatchDetails()!=null&&updateReqVO.getTaskDispatchDetails().size()>0) {
             Map<String, Object> mapp = (Map<String, Object>) updateReqVO.getTaskDispatchDetails().get(0);
-            if (mapp.get("remindman") != null) {
+//            if (mapp.get("remindman") != null) {
                 for (Object taskDispatchDetail : updateReqVO.getTaskDispatchDetails()) {
                     Map<String, Object> map = (Map<String, Object>) taskDispatchDetail;
                     Object remindmanValue = map.get("remindman");
@@ -76,7 +76,7 @@ public class AttentiontodoServiceImpl implements AttentiontodoService {
                     attentiontodoMapper.insert(attentiontodo);
                 }
             }
-        }
+//        }
     }
 
     @Override

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml

@@ -22,7 +22,7 @@
 
 SELECT a.*, b.tenant_id as txrid
 FROM db_attentiontodo a
-         INNER JOIN system_users b ON a.attr4 = b.nickname
+         LEFT JOIN system_users b ON a.attr4 = b.nickname
 WHERE a.attr2 = #{param1}
 
     </select>