1.修复严重违法行政处罚获取市局人员问题
This commit is contained in:
parent
9cd671dc78
commit
eee81a8b2a
|
|
@ -231,8 +231,9 @@ public class TSBizRemListServiceImpl extends ServiceImpl<TSBizRemListMapper, TSB
|
||||||
|
|
||||||
// 生成决定书附件
|
// 生成决定书附件
|
||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
String areaName = Constant.GZ_REGION_CODE.get(tsWritModel.getAreaCode());
|
String areaNameq = Constant.GZ_REGION_CODE.get(tsWritModel.getAreaCode());
|
||||||
areaName = areaName.contains("广州市") ? areaName : ("广州市" + areaName);
|
String nmSareaName = Constant.NM_REGION_CODE.get(tsWritModel.getAreaCode().substring(0, 4) + "00");
|
||||||
|
String areaName = nmSareaName + areaNameq;
|
||||||
map.put("areaName", areaName);
|
map.put("areaName", areaName);
|
||||||
map.put("writsNo", tsWritModel.getWritsno());
|
map.put("writsNo", tsWritModel.getWritsno());
|
||||||
map.put("htmlContent", tsWritModel.getContent());
|
map.put("htmlContent", tsWritModel.getContent());
|
||||||
|
|
|
||||||
|
|
@ -654,6 +654,18 @@ public class UserController extends BaseController {
|
||||||
@ApiOperation("获取当前部门的权限列表人")
|
@ApiOperation("获取当前部门的权限列表人")
|
||||||
@GetMapping("/listUserByPermissionAndOrgIds")
|
@GetMapping("/listUserByPermissionAndOrgIds")
|
||||||
public RestResult<List<AICUser>> listUserByPermissionAndOrgIds(String permission, String orgId, Boolean isArea, HttpServletRequest request) {
|
public RestResult<List<AICUser>> listUserByPermissionAndOrgIds(String permission, String orgId, Boolean isArea, HttpServletRequest request) {
|
||||||
|
AICUser loginUser = getLoginUser(request);
|
||||||
|
List<AICUser> userList = usersService.findUserByPermissionAndOrgIds(permission, orgId, isArea, loginUser);
|
||||||
|
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);
|
AICUser loginUser = getLoginUser(request);
|
||||||
orgId = loginUser.getOrgID().substring(0, 4) + "00";
|
orgId = loginUser.getOrgID().substring(0, 4) + "00";
|
||||||
List<AICUser> userList = usersService.findUserByPermissionAndOrgIds(permission, orgId, isArea, loginUser);
|
List<AICUser> userList = usersService.findUserByPermissionAndOrgIds(permission, orgId, isArea, loginUser);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue