Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/service/impl/CmmsUpkeepServiceImpl.java

@@ -149,7 +149,7 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
      */
     public List<CmmsUpkeepDto> selectMyOperateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
         LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        cmmsUpkeepDto.setChargeruser(user.getUsername());
+        cmmsUpkeepDto.setChargeruser(user.getId());
         return cmmsUpkeepMapper.selectMyOperateList(page, cmmsUpkeepDto);
     }
 

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/impl/CmmsUpkeepPlanServiceImpl.java

@@ -223,6 +223,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
      */
     public boolean updateCmmsUpkeepPlanStatusById(CmmsUpkeepPlan cmmsUpkeepPlan){
         boolean rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanStatusById(cmmsUpkeepPlan);
+        //如果一个设备的计划执行了，那么该设备的其他计划都禁止启用   0启用1禁用
         if(cmmsUpkeepPlan.getStatus().equals("0")) cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanStatusByEqid(cmmsUpkeepPlan);
         setRedisCache();
         return rtn;