部门筛选调整

src/main/java/com/jeeplus/modules/bzshbExamine/service/StandardOpinionAllService.java

@@ -1,11 +1,13 @@
 package com.jeeplus.modules.bzshbExamine.service;
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.bzshbExamine.dao.StandardOpinionDao;
 import com.jeeplus.modules.bzshbExamine.entity.StandardOpinion;
 import com.jeeplus.modules.sys.dao.UserDao;
+import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,10 +37,18 @@ public class StandardOpinionAllService extends CrudService<StandardOpinionDao, S
 
     public Page<StandardOpinion> findPage(Page<StandardOpinion> page, StandardOpinion standardOpinion) {
         if(StringUtils.isNotBlank(standardOpinion.getOfficeId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(standardOpinion.getOfficeId());
-            officeIdList.add(standardOpinion.getOfficeId());
-            standardOpinion.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(standardOpinion.getOfficeId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                standardOpinion.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(standardOpinion.getOfficeId());
+                officeIdList.add(standardOpinion.getOfficeId());
+                standardOpinion.setOfficeIdList(officeIdList);
+            }
+
         }
         List<String> auditUserIdList = null;
         //判断是否选择对应总审

src/main/java/com/jeeplus/modules/bzshbExamine/service/StandardOpinionService.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.bzshbExamine.service;
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.StringUtils;
@@ -8,6 +9,7 @@ import com.jeeplus.modules.bzshbExamine.dao.StandardOpinionDao;
 import com.jeeplus.modules.bzshbExamine.entity.BzshbExaminInfo;
 import com.jeeplus.modules.bzshbExamine.entity.StandardOpinion;
 import com.jeeplus.modules.sys.dao.UserDao;
+import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +39,18 @@ public class StandardOpinionService extends CrudService<StandardOpinionDao, Stan
 
     public Page<StandardOpinion> findPage(Page<StandardOpinion> page, StandardOpinion standardOpinion) {
         if(StringUtils.isNotBlank(standardOpinion.getOfficeId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(standardOpinion.getOfficeId());
-            officeIdList.add(standardOpinion.getOfficeId());
-            standardOpinion.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(standardOpinion.getOfficeId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                standardOpinion.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(standardOpinion.getOfficeId());
+                officeIdList.add(standardOpinion.getOfficeId());
+                standardOpinion.setOfficeIdList(officeIdList);
+            }
+
         }
 
         //查询当前登录人对应的所有总审id

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageAllConfigService.java

@@ -33,10 +33,18 @@ public class RuralProjectMessageAllConfigService extends CrudService<RuralProjec
 
     public Page<RuralProjectMessageAllConfig> findPage(Page<RuralProjectMessageAllConfig> page, RuralProjectMessageAllConfig ruralProjectMessageAllConfig) {
         if(StringUtils.isNotBlank(ruralProjectMessageAllConfig.getOfficeId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(ruralProjectMessageAllConfig.getOfficeId());
-            officeIdList.add(ruralProjectMessageAllConfig.getOfficeId());
-            ruralProjectMessageAllConfig.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(ruralProjectMessageAllConfig.getOfficeId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                ruralProjectMessageAllConfig.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(ruralProjectMessageAllConfig.getOfficeId());
+                officeIdList.add(ruralProjectMessageAllConfig.getOfficeId());
+                ruralProjectMessageAllConfig.setOfficeIdList(officeIdList);
+            }
+
         }
         Integer count = dao.queryCount(ruralProjectMessageAllConfig);
         if(null == count){

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageAllService.java

@@ -1643,10 +1643,18 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
             projectRecords.setEndingCount(endingCount);
         }
         if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
-            officeIdList.add(projectRecords.getOffice().getId());
-            projectRecords.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(projectRecords.getOffice().getId())) {
+                List<String> officeIdList = com.google.common.collect.Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
+                officeIdList.add(projectRecords.getOffice().getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            }
+
         }
 
         int count = dao.querySignatureCount(projectRecords);
@@ -1687,10 +1695,18 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
             projectRecords.setEndingCount(endingCount);
         }
         if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
-            officeIdList.add(projectRecords.getOffice().getId());
-            projectRecords.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(projectRecords.getOffice().getId())) {
+                List<String> officeIdList = com.google.common.collect.Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
+                officeIdList.add(projectRecords.getOffice().getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            }
+
         }
 
         int count = dao.querySignatureCount(projectRecords);
@@ -1731,10 +1747,18 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
             projectRecords.setEndingCount(endingCount);
         }
         if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
-            officeIdList.add(projectRecords.getOffice().getId());
-            projectRecords.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(projectRecords.getOffice().getId())) {
+                List<String> officeIdList = com.google.common.collect.Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
+                officeIdList.add(projectRecords.getOffice().getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            }
+
         }
 
         int count = dao.querySignatureCount(projectRecords);

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -263,10 +263,18 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         }
 
         if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
-            officeIdList.add(projectRecords.getOffice().getId());
-            projectRecords.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(projectRecords.getOffice().getId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
+                officeIdList.add(projectRecords.getOffice().getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            }
+
         }
         int count = dao.queryCount(projectRecords);
         page.setCount(count);

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -349,10 +349,18 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			projectRecords.getSqlMap().put("delFlag", "AND a.del_flag = 0");
         }
         if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
-        	//查询该选择节点下所有的部门Id
-			List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
-			officeIdList.add(projectRecords.getOffice().getId());
-			projectRecords.setOfficeIdList(officeIdList);
+			if ("一部本部".equals(projectRecords.getOffice().getId())) {
+				List<String> officeIdList = Lists.newArrayList();
+				Office office = officeService.getByName("工程一部");
+				officeIdList.add(office.getId());
+				projectRecords.setOfficeIdList(officeIdList);
+			} else {
+				//查询该选择节点下所有的部门Id
+				List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
+				officeIdList.add(projectRecords.getOffice().getId());
+				projectRecords.setOfficeIdList(officeIdList);
+			}
+
 		}
         int count = dao.queryCount(projectRecords);
         page.setCount(count);

src/main/java/com/jeeplus/modules/signature/dailyOfficeWork/service/DailyOfficeWorkService.java

@@ -136,10 +136,18 @@ public class DailyOfficeWorkService extends CrudService<DailyOfficeWorkDao, Dail
             dailyOfficeWork.getSqlMap().put("delFlag", "AND a.del_flag = 0");
         }
         if(null!= dailyOfficeWork.getOffice() && StringUtils.isNotBlank(dailyOfficeWork.getOffice().getId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(dailyOfficeWork.getOffice().getId());
-            officeIdList.add(dailyOfficeWork.getOffice().getId());
-            dailyOfficeWork.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(dailyOfficeWork.getOffice().getId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                dailyOfficeWork.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(dailyOfficeWork.getOffice().getId());
+                officeIdList.add(dailyOfficeWork.getOffice().getId());
+                dailyOfficeWork.setOfficeIdList(officeIdList);
+            }
+
         }
         int count = dao.queryCount(dailyOfficeWork);
         page.setCount(count);

src/main/java/com/jeeplus/modules/signatureManagement/businessSignature/service/BusinessSignatureService.java

@@ -120,10 +120,18 @@ public class BusinessSignatureService extends CrudService<BusinessSignatureDao,
             businessSignatureInfo.getSqlMap().put("delFlag", "AND a.del_flag = 0");
         }
         if(null!= businessSignatureInfo.getOffice() && StringUtils.isNotBlank(businessSignatureInfo.getOffice().getId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(businessSignatureInfo.getOffice().getId());
-            officeIdList.add(businessSignatureInfo.getOffice().getId());
-            businessSignatureInfo.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(businessSignatureInfo.getOffice().getId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                businessSignatureInfo.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(businessSignatureInfo.getOffice().getId());
+                officeIdList.add(businessSignatureInfo.getOffice().getId());
+                businessSignatureInfo.setOfficeIdList(officeIdList);
+            }
+
         }
         int count = dao.queryCount(businessSignatureInfo);
         page.setCount(count);

src/main/java/com/jeeplus/modules/signatureManagement/electronicSignature/service/DistrictDirectorApplicationService.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.signatureManagement.electronicSignature.service;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
@@ -99,10 +100,18 @@ public class DistrictDirectorApplicationService extends CrudService<DistrictDire
             directorApplication.getSqlMap().put("delFlag", "AND a.del_flag = 0");
         }
         if(null!= directorApplication.getOffice() && org.apache.commons.lang3.StringUtils.isNotBlank(directorApplication.getOffice().getId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(directorApplication.getOffice().getId());
-            officeIdList.add(directorApplication.getOffice().getId());
-            directorApplication.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(directorApplication.getOffice().getId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                directorApplication.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(directorApplication.getOffice().getId());
+                officeIdList.add(directorApplication.getOffice().getId());
+                directorApplication.setOfficeIdList(officeIdList);
+            }
+
         }
         int count = dao.queryCount(directorApplication);
         page.setCount(count);

src/main/java/com/jeeplus/modules/signatureManagement/electronicSignature/service/ElectronicSignatureService.java

@@ -117,10 +117,18 @@ public class ElectronicSignatureService extends CrudService<ElectronicSignatureD
             electronicSignatureInfo.getSqlMap().put("delFlag", "AND a.del_flag = 0");
         }
         if(null!= electronicSignatureInfo.getOffice() && StringUtils.isNotBlank(electronicSignatureInfo.getOffice().getId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(electronicSignatureInfo.getOffice().getId());
-            officeIdList.add(electronicSignatureInfo.getOffice().getId());
-            electronicSignatureInfo.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(electronicSignatureInfo.getOffice().getId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                electronicSignatureInfo.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(electronicSignatureInfo.getOffice().getId());
+                officeIdList.add(electronicSignatureInfo.getOffice().getId());
+                electronicSignatureInfo.setOfficeIdList(officeIdList);
+            }
+
         }
         int count = dao.queryCount(electronicSignatureInfo);
         page.setCount(count);

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementAllService.java

@@ -284,10 +284,18 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
 //            workReimbursement.getSqlMap().put("dsf",str.substring(0,matcher.start()) + str.substring(matcher.start()+3));
 //        }
         if(StringUtils.isNotBlank(workReimbursement.getOfficeId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(workReimbursement.getOfficeId());
-            officeIdList.add(workReimbursement.getOfficeId());
-            workReimbursement.setOfficeIdList(officeIdList);
+            if ("一部本部".equals(workReimbursement.getOfficeId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                workReimbursement.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(workReimbursement.getOfficeId());
+                officeIdList.add(workReimbursement.getOfficeId());
+                workReimbursement.setOfficeIdList(officeIdList);
+            }
+
         }
 
         if(StringUtils.isNotBlank(workReimbursement.getBusinessType())){

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -315,11 +315,20 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             workReimbursement.getSqlMap().put("dsf",str.substring(0,matcher.start()) + str.substring(matcher.start()+3));
         }
         workReimbursement.setCreateBy(UserUtils.getUser());
-        if(StringUtils.isNotBlank(workReimbursement.getOfficeId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(workReimbursement.getOfficeId());
-            officeIdList.add(workReimbursement.getOfficeId());
-            workReimbursement.setOfficeIdList(officeIdList);
+        if(StringUtils.isNotBlank(workReimbursement.getOfficeId())) {
+            if ("一部本部".equals(workReimbursement.getOfficeId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                workReimbursement.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(workReimbursement.getOfficeId());
+                officeIdList.add(workReimbursement.getOfficeId());
+                if (officeIdList.size() > 0) {
+                    workReimbursement.setOfficeIdList(officeIdList);
+                }
+            }
         }
         if(StringUtils.isNotBlank(workReimbursement.getBusinessType())){
             //查询报销类型parentIds

src/main/resources/jeeplus.properties

@@ -7,7 +7,7 @@ jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://8.136.152.135:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://192.168.2.4:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=root
 #jdbc.password=Xgcomdata10376@