Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -346,7 +346,6 @@ public class BizDayworkItemController extends BaseController {
     public AjaxResult getDayWorkItemFinishHistory(String startTime, String endTime) {
         startTime = startTime + " 00:00:00";
         endTime = endTime + " 23:59:59";
-
         List<BizDayworkItem> list = bizDayworkItemService.getDayWorkItemHistory(startTime, endTime, SecurityUtils.getLoginUser().getUser().getUserName());
         if(!list.isEmpty()){
             List<BizDayworkItem> finishedList = list.stream().filter(item -> item.getStatus().equals("3")).collect(Collectors.toList());

src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupDetailController.java

@@ -91,12 +91,15 @@ public class BizProductionResourceGroupDetailController extends BaseController {
             groupIds.add(item.getResourceGroupId());
         }
         //查出当前人员所在的资源组
-        List<BizProductionResourceGroupDetail> userGroupList = bizProductionResourceGroupDetailService.query().in("production_resource_group_id", groupIds).eq("common_id", user.getUserId()).eq("common_type","person").list();
+        List<BizProductionResourceGroupDetail> userGroupList = bizProductionResourceGroupDetailService.query()
+                .eq("dept_id",deptId)
+                .in("production_resource_group_id", groupIds).eq("common_id", user.getUserId()).eq("common_type","person").list();
         for (BizProductionResourceGroupDetail userItem : userGroupList
         ) {
             equipmentIds.add(userItem.getProductionResourceGroupId());
         }
-        List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.query().in("production_resource_group_id", equipmentIds).eq("common_type", "equipmentDetail").inSql("common_id", "SELECT id FROM biz_equipment_detail WHERE equipment_status_code = 'NA'").eq("deleted",0).list();
+        List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.query().eq("dept_id",deptId)
+                .in("production_resource_group_id", equipmentIds).eq("common_type", "equipmentDetail").inSql("common_id", "SELECT id FROM biz_equipment_detail WHERE equipment_status_code = 'NA'").eq("deleted",0).list();
 
         BizUserEquipmentGroup groupDetails = new BizUserEquipmentGroup();
         groupDetails.setUserId(user.getUserId());

src/main/resources/application-dev.yml

@@ -30,7 +30,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://120.46.159.163:7306/dms_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://120.46.159.163:7306/ezhizao_dms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
 #        url: jdbc:mysql://localhost:3306/ezhizao_dms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
         username: root
         password: ezhizao.cn@dms.40

src/main/resources/application-linux.yml

@@ -35,7 +35,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.10.40:3306/dms_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.10.40:3306/ezhizao_dms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
                 username: root
                 password: ezhizao.cn@dms.40
             # 从库数据源