Commit 8e9c103f by 张祺

修改配置项管理和填报单位管理的配置

parent db434e16
...@@ -33,7 +33,7 @@ public class ConfigInfoCtrl { ...@@ -33,7 +33,7 @@ public class ConfigInfoCtrl {
@ApiOperation(value = "添加配置项信息", notes="添加配置项信息") @ApiOperation(value = "添加配置项信息", notes="添加配置项信息")
public ConfigInfo addConfigInfo(@RequestBody ConfigInfo configInfo) { public ConfigInfo addConfigInfo(@RequestBody ConfigInfo configInfo) {
Date now = new Date(); Date now = new Date();
String userId = SystemUserUtil.getCurrentUserId(); String userId = SystemUserUtil.getCurrentUser();
configInfo.setUpdater(userId); configInfo.setUpdater(userId);
configInfo.setCreator(userId); configInfo.setCreator(userId);
configInfo.setCreateTime(now); configInfo.setCreateTime(now);
...@@ -50,7 +50,7 @@ public class ConfigInfoCtrl { ...@@ -50,7 +50,7 @@ public class ConfigInfoCtrl {
@PostMapping("updateConfigInfo") @PostMapping("updateConfigInfo")
@ApiOperation(value = "修改配置项信息", notes="修改配置项信息") @ApiOperation(value = "修改配置项信息", notes="修改配置项信息")
public ConfigInfo updateConfigInfo(@RequestBody ConfigInfo configInfo) { public ConfigInfo updateConfigInfo(@RequestBody ConfigInfo configInfo) {
String userId = SystemUserUtil.getCurrentUserId(); String userId = SystemUserUtil.getCurrentUser();
ConfigInfo tmp = configInfoService.getConfigInfoById(configInfo.getId()); ConfigInfo tmp = configInfoService.getConfigInfoById(configInfo.getId());
tmp.setCfDesc(configInfo.getCfDesc()); tmp.setCfDesc(configInfo.getCfDesc());
tmp.setCfValue(configInfo.getCfValue()); tmp.setCfValue(configInfo.getCfValue());
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</select> </select>
<select id="findCount" resultType="long"> <select id="findCount" resultType="long">
select count(i) select count(id)
from data_enter_rule_obj from data_enter_rule_obj
<include refid="findWhereSql"></include> <include refid="findWhereSql"></include>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment