nm-project
/
aiccs-api
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nm-project:926d801c1d0e82cf1da8dcbd1f7d5d488db13ea3
Branches Tags
nm-project:master
..
compare: nm-project:889d2803940c6f859782a830686c1f0f6e9d39b4
Branches Tags
nm-project:master

No commits in common. "926d801c1d0e82cf1da8dcbd1f7d5d488db13ea3" and "889d2803940c6f859782a830686c1f0f6e9d39b4" have entirely different histories.
926d801c1d ... 889d280394

2 changed files with 2 additions and 16 deletions
Show Stats Expand all files Collapse all files

5
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/TSBizRemListServiceImpl.java
View File

@ -231,9 +231,8 @@ public class TSBizRemListServiceImpl extends ServiceImpl<TSBizRemListMapper, TSB
// 生成决定书附件
HashMap<String, Object> map = new HashMap<>();
String areaNameq = Constant.GZ_REGION_CODE.get(tsWritModel.getAreaCode());
String nmSareaName = Constant.NM_REGION_CODE.get(tsWritModel.getAreaCode().substring(0, 4) + "00");
String areaName = nmSareaName + areaNameq;
String areaName = Constant.GZ_REGION_CODE.get(tsWritModel.getAreaCode());
areaName = areaName.contains("广州市") ? areaName : ("广州市" + areaName);
map.put("areaName", areaName);
map.put("writsNo", tsWritModel.getWritsno());
map.put("htmlContent", tsWritModel.getContent());

13
src/main/java/com/chinaweal/aiccs/org/controller/UserController.java
View File

@ -659,19 +659,6 @@ public class UserController extends BaseController {
return RestResult.ok(userList);
}
/**
* 获取严重违法当前部门的权限列表人
* isArea = true 同时也查询出区的
*/
@ApiOperation("获取当前部门的权限列表人")
@GetMapping("/listUserByPermissionAndOrgIdsYzwf")
public RestResult<List<AICUser>> listUserByPermissionAndOrgIdsYzwf(String permission, String orgId, Boolean isArea, HttpServletRequest request) {
AICUser loginUser = getLoginUser(request);
orgId = loginUser.getOrgID().substring(0, 4) + "00";
List<AICUser> userList = usersService.findUserByPermissionAndOrgIds(permission, orgId, isArea, loginUser);
return RestResult.ok(userList);
}
/**
* 列异获取审核人
*/