chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 字典修改bug

This commit is contained in:
ant 2024-07-29 18:17:47 +08:00
parent 7137904683
commit bc685775f6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml
View File

@ -11,7 +11,7 @@
t2.dept_name as deptName, t2.dept_name as deptName,
t1.contract_amount as contractAmount, t1.contract_amount as contractAmount,
t2.dept_id as deptId, t2.dept_id as deptId,
t1.payment_amount as paymentAmount, t1.payment_amount as paymentAmount
from from
wrk_project_contract t1 inner join wrk_project t2 on t1.project_id = t2.project_id wrk_project_contract t1 inner join wrk_project t2 on t1.project_id = t2.project_id
<where> <where>

4
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java
View File

@ -77,7 +77,7 @@ public class DictController {
public AjaxResult add(@Validated @RequestBody SysDictData dict) public AjaxResult add(@Validated @RequestBody SysDictData dict)
{ {
dict.setCreateBy(SecurityUtils.getUsername()); dict.setCreateBy(SecurityUtils.getUsername());
dictDataService.saveOrUpdate(dict); dictDataService.save(dict);
return AjaxResult.success(); return AjaxResult.success();
} }
@ -90,7 +90,7 @@ public class DictController {
public AjaxResult edit(@Validated @RequestBody SysDictData dict) public AjaxResult edit(@Validated @RequestBody SysDictData dict)
{ {
dict.setUpdateBy(SecurityUtils.getUsername()); dict.setUpdateBy(SecurityUtils.getUsername());
dictDataService.saveOrUpdate(dict); dictDataService.updateById(dict);
return AjaxResult.success(); return AjaxResult.success();
} }

3
chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/controller/TaskController.java
View File

@ -30,7 +30,8 @@ public class TaskController {
public AjaxResult page(TaskInfo taskInfo){ public AjaxResult page(TaskInfo taskInfo){
CommonParam commonParam = CommonParam.buildPageRequest(); CommonParam commonParam = CommonParam.buildPageRequest();
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getUserId();
taskInfo.setUserId(userId); if (userId != 1)
taskInfo.setUserId(userId);
PageResult pageResult = taskInfoService.pagePostList(taskInfo, commonParam); PageResult pageResult = taskInfoService.pagePostList(taskInfo, commonParam);
return AjaxResult.success(pageResult); return AjaxResult.success(pageResult);
} }