diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml index fbae816..42e0bce 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml @@ -11,7 +11,7 @@ t2.dept_name as deptName, t1.contract_amount as contractAmount, t2.dept_id as deptId, - t1.payment_amount as paymentAmount, + t1.payment_amount as paymentAmount from wrk_project_contract t1 inner join wrk_project t2 on t1.project_id = t2.project_id diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java index 7f63e68..914d60d 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java @@ -77,7 +77,7 @@ public class DictController { public AjaxResult add(@Validated @RequestBody SysDictData dict) { dict.setCreateBy(SecurityUtils.getUsername()); - dictDataService.saveOrUpdate(dict); + dictDataService.save(dict); return AjaxResult.success(); } @@ -90,7 +90,7 @@ public class DictController { public AjaxResult edit(@Validated @RequestBody SysDictData dict) { dict.setUpdateBy(SecurityUtils.getUsername()); - dictDataService.saveOrUpdate(dict); + dictDataService.updateById(dict); return AjaxResult.success(); } diff --git a/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/controller/TaskController.java b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/controller/TaskController.java index 4e7e41c..0ce4faa 100644 --- a/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/controller/TaskController.java +++ b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/controller/TaskController.java @@ -30,7 +30,8 @@ public class TaskController { public AjaxResult page(TaskInfo taskInfo){ CommonParam commonParam = CommonParam.buildPageRequest(); Long userId = SecurityUtils.getUserId(); - taskInfo.setUserId(userId); + if (userId != 1) + taskInfo.setUserId(userId); PageResult pageResult = taskInfoService.pagePostList(taskInfo, commonParam); return AjaxResult.success(pageResult); }