1. 字典修改bug
This commit is contained in:
parent
7137904683
commit
bc685775f6
|
|
@ -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
|
||||
<where>
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ public class TaskController {
|
|||
public AjaxResult page(TaskInfo taskInfo){
|
||||
CommonParam commonParam = CommonParam.buildPageRequest();
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
if (userId != 1)
|
||||
taskInfo.setUserId(userId);
|
||||
PageResult pageResult = taskInfoService.pagePostList(taskInfo, commonParam);
|
||||
return AjaxResult.success(pageResult);
|
||||
|
|
|
|||
Loading…
Reference in New Issue