机关业务指导处

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

@@ -31,10 +31,12 @@ import com.ozs.pm.mapper.PmAuditDeptRefMapper;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.IPmDemandService;
 import com.ozs.pm.service.PmAuditDeptRefService;
+import com.ozs.system.domain.SysDeptOrgan;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
+import com.ozs.system.mapper.SysDeptOrganMapper;
 import com.ozs.system.mapper.SysFileRefMapper;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictDataService;
@@ -95,6 +97,8 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     private PmAuditDeptRefService pmAuditDeptRefService;
     @Autowired
     private PmAuditDeptRefMapper pmAuditDeptRefMapper;
+    @Autowired
+    private SysDeptOrganMapper sysDeptOrganMapper;
 
     @Override
     public List<PlanQuarterResponseVo> selectPlanQuarterListEXP(PlanQuarterStandardVo vo, LoginUser loginUser) {
@@ -824,25 +828,25 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             String organDivision = planQuarter.getOrganDivision();
             if (!ObjectUtils.isEmpty(organDivision)) {
                 int length = organDivision.split(",").length;
-                SysDept sysDept = new SysDept();
+                SysDeptOrgan organ = new SysDeptOrgan();
                 if (length > 1) {
                     StringBuilder builder = new StringBuilder();
                     String[] split = organDivision.split(",");
                     for (String s : split) {
-                        sysDept = deptService.selectById(Long.valueOf(s));
-                        if (!ObjectUtils.isEmpty(sysDept)) {
+                        organ = sysDeptOrganMapper.selectById(s);
+                        if (!ObjectUtils.isEmpty(organ)) {
                             if (!organDivision.endsWith(s)) {
-                                builder.append(sysDept.getDeptName() + ",");
+                                builder.append(organ.getOrganName() + ",");
                             } else {
-                                builder.append(sysDept.getDeptName());
+                                builder.append(organ.getOrganName());
                             }
                         }
                     }
                     planQuarter.setOrganDivisionStr(builder.toString());
                 } else if (length == 1) {
-                    sysDept = deptService.selectById(Long.valueOf(organDivision));
-                    if (!ObjectUtils.isEmpty(sysDept)) {
-                        planQuarter.setOrganDivisionStr(sysDept.getDeptName());
+                    organ = sysDeptOrganMapper.selectById(organDivision);
+                    if (!ObjectUtils.isEmpty(organ)) {
+                        planQuarter.setOrganDivisionStr(organ.getOrganName());
                     }
                 }
             }

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

@@ -1466,25 +1466,25 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             String organDivision = planYear.getOrganDivision();
             if (!ObjectUtils.isEmpty(organDivision)) {
                 int length = organDivision.split(",").length;
-                SysDept sysDept = new SysDept();
+                SysDeptOrgan organ = new SysDeptOrgan();
                 if (length > 1) {
                     StringBuilder builder = new StringBuilder();
                     String[] split = organDivision.split(",");
                     for (String s : split) {
-                        sysDept = deptService.selectById(Long.valueOf(s));
-                        if (!ObjectUtils.isEmpty(sysDept)) {
+                        organ = sysDeptOrganMapper.selectById(s);
+                        if (!ObjectUtils.isEmpty(organ)) {
                             if (!organDivision.endsWith(s)) {
-                                builder.append(sysDept.getDeptName() + ",");
+                                builder.append(organ.getOrganName() + ",");
                             } else {
-                                builder.append(sysDept.getDeptName());
+                                builder.append(organ.getOrganName());
                             }
                         }
                     }
                     planYear.setOrganDivisionStr(builder.toString());
                 } else if (length == 1) {
-                    sysDept = deptService.selectById(Long.valueOf(organDivision));
-                    if (!ObjectUtils.isEmpty(sysDept)) {
-                        planYear.setOrganDivisionStr(sysDept.getDeptName());
+                    organ = sysDeptOrganMapper.selectById(organDivision);
+                    if (!ObjectUtils.isEmpty(organ)) {
+                        planYear.setOrganDivisionStr(organ.getOrganName());
                     }
                 }
             }