diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java index 74f436757..6d4fe8d79 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java @@ -129,7 +129,7 @@ public class PollutionSubstationController extends BaseController { StatSubstationBizBaseParam param=new StatSubstationBizBaseParam(); param.setStartTime(startTime); param.setEndTime(endTime); - pollutionSubstationService.downPollutionLineCalc(param); + pollutionSubstationService.downPollutionLineCalc(param); } @OperateInfo(info = LogEnum.BUSINESS_COMMON) diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml index 07539fa51..9d2e56d7f 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml @@ -29,12 +29,12 @@ sys_area T5 WHERE FIND_IN_SET( #{id}, T3.pids ) - and t3.type in + and T3.type in #{item} - AND t3.area = t5.id - AND t3.State = 1 + AND T3.area = T5.id + AND T3.State = 1 UNION SELECT T3.*, @@ -44,9 +44,9 @@ sys_dept T3, sys_area T5 WHERE - t3.area = t5.id + T3.area = T5.id and T3.id = #{id} - AND t3.State = 1 + AND T3.State = 1