计划管理———添加审核列表的部门参数判断

pom.xml

@@ -253,7 +253,7 @@
         <repository>
             <id>custom_group</id>
             <name>Nexus Repository</name>
-            <url>http://124.71.171.71:18881/repository/custom_group/</url>
+            <url>http://47.94.132.61:18881/repository/custom_group/</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -266,7 +266,7 @@
         <pluginRepository>
             <id>custom_group</id>
             <name>Nexus Plugin Repository</name>
-            <url>http://124.71.171.71:18881/repository/custom_group/</url>
+            <url>http://47.94.132.61:18881/repository/custom_group/</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -280,12 +280,12 @@
         <repository><!--部署项目产生的构件到远程仓库需要的信息 -->
             <id>custom_releases</id><!-- 此处id和settings.xml的id保持一致 -->
             <name>Nexus Release Repository</name>
-            <url>http://124.71.171.71:18881/repository/custom_releases/</url>
+            <url>http://47.94.132.61:18881/repository/custom_releases/</url>
         </repository>
         <snapshotRepository><!--构件的快照部署到哪里？如果没有配置该元素，默认部署到repository元素配置的仓库，参见distributionManagement/repository元素 -->
             <id>custom_snapshots</id><!-- 此处id和settings.xml的id保持一致 -->
             <name>Nexus Snapshot Repository</name>
-            <url>http://124.71.171.71:18881/repository/custom_snapshots/</url>
+            <url>http://47.94.132.61:18881/repository/custom_snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
 </project>

purchase-admin/src/main/resources/application.yml

@@ -10,4 +10,5 @@ server:
 # Spring配置
 spring:
   profiles:
+#    active: prod
     active: druid,test

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -645,7 +645,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     @Override
     public List<PlanQuarter> queryPage(PlanQuarterStandardVo vo) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+        if (!loginUser.getUserId().equals(Long.valueOf("1")) && StringUtils.isEmpty(vo.getPurchaseDeptId())) {
             vo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
         }
         List<PlanQuarter> query = planQuarterMapper.query(vo);

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -43,18 +43,16 @@ import com.ozs.system.mapper.SysFileRefMapper;
 import com.ozs.system.mapper.SysRoleMapper;
 import com.ozs.system.service.*;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-import javax.validation.Validator;
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -70,43 +68,41 @@ import java.util.stream.Collectors;
 @Slf4j
 public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears> implements PlanYearsService {
 
-    @Autowired
-    PlanYearsMapper planYearsMapper;
-    @Autowired
+    @Resource
+    private PlanYearsMapper planYearsMapper;
+    @Resource
     private PlanQuarterMapper planQuarterMapper;
-    @Autowired
-    protected Validator validator;
-    @Autowired
+    @Resource
     private ISysDictTypeService dictTypeService;
-    @Autowired
+    @Resource
     private ISysDeptService deptService;
-    @Autowired
+    @Resource
     private SysFileRefMapper sysFileRefMapper;
-    @Autowired
+    @Resource
     private SysDeptOrganMapper sysDeptOrganMapper;
-    @Autowired
+    @Resource
     private SysDeptMapper deptMapper;
-    @Autowired
+    @Resource
     private SysFileService fileService;
-    @Autowired
+    @Resource
     private SysRoleMapper sysRoleMapper;
-    @Autowired
+    @Resource
     private ISysUserService userService;
-    @Autowired
+    @Resource
     private PmDemandMapper pmDemandMapper;
-    @Autowired
+    @Resource
     private PlanQuarterServiceImpl quartzServiceImpl;
-    @Autowired
+    @Resource
     private IPmDemandService demandService;
-    @Autowired
+    @Resource
     private ProvisionalPlanMapper provisionalPlanMapper;
-    @Autowired
+    @Resource
     private SysFileRefService sysFileRefService;
-    @Autowired
+    @Resource
     private PmAuditDeptRefService pmAuditDeptRefService;
-    @Autowired
+    @Resource
     private PmAuditDeptRefMapper pmAuditDeptRefMapper;
-    @Autowired
+    @Resource
     private PlanQuarterMapper quarterMapper;
 
     @Override
@@ -1177,7 +1173,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         }
         vo.setParams(params);
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+        if (!loginUser.getUserId().equals(Long.valueOf("1")) && StringUtils.isEmpty(vo.getPurchaseDeptId())) {
             vo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
         }
         List<PlanYears> planYears = planYearsMapper.query(vo);

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -563,7 +563,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     @Override
     public List<ProvisionalPlan> queryPage(ProvisionalPlanVo vo) throws ParseException {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (!loginUser.getUserId().equals(Long.valueOf("1"))) {
+        if (!loginUser.getUserId().equals(Long.valueOf("1")) && ObjectUtils.isEmpty(vo.getPurchaseDeptId())) {
             vo.setPurchaseDeptId(loginUser.getDeptId());
         }
         List<ProvisionalPlan> provisionalPlanList = provisionalPlanMapper.query(vo);

purchase-system/src/main/java/com/ozs/pm/service/impl/PmAuditDeptRefServiceImpl.java

@@ -12,13 +12,11 @@ import com.ozs.pm.doman.PmAuditDeptRef;
 import com.ozs.pm.service.PmAuditDeptRefService;
 import com.ozs.system.mapper.SysDeptMapper;
 import com.ozs.system.mapper.SysProcurementStandardMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import javax.validation.Validator;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
@@ -33,15 +31,13 @@ import java.util.List;
 @Service
 public class PmAuditDeptRefServiceImpl extends ServiceImpl<PmAuditDeptRefMapper, PmAuditDeptRef> implements PmAuditDeptRefService {
 
-    @Autowired
+    @Resource
     PlanYearsMapper planYearsMapper;
-    @Autowired
-    protected Validator validator;
-    @Autowired
+    @Resource
     private SysDeptMapper deptMapper;
     @Resource
     private SysProcurementStandardMapper sysProcurementStandardMapper;
-    @Autowired
+    @Resource
     private PmAuditDeptRefService pmAuditDeptRefService;
 
     @Override