|
|
|
@ -337,13 +337,19 @@ public class AppEnforcementRegistrationController extends BaseController { |
|
|
|
|
|
|
|
for (EnforcementRegistrationVo reg : regResults) { |
|
|
|
// 执法人员1需要展示用户名+执法码 没有执法码展示加密手机号
|
|
|
|
SysUserVo sysUserVo = sysUserService.selectUserById(Long.valueOf(vo.getLawEnforcerId())); |
|
|
|
if (sysUserVo != null){ |
|
|
|
String lawCN = sysUserVo.getUserName() +" "+sysUserVo.getLawCertificateNum(); |
|
|
|
if(StringUtils.isEmpty(sysUserVo.getLawCertificateNum())){ |
|
|
|
lawCN=sysUserVo.getUserName() +" "+ CommonUtil.encryptPhone(sysUserVo.getPhonenumber()); |
|
|
|
if (StringUtils.isNotEmpty(vo.getLawEnforcerId())) { |
|
|
|
try { |
|
|
|
SysUserVo sysUserVo = sysUserService.selectUserById(Long.valueOf(vo.getLawEnforcerId())); |
|
|
|
if (sysUserVo != null){ |
|
|
|
String lawCN = sysUserVo.getUserName() +" "+sysUserVo.getLawCertificateNum(); |
|
|
|
if(StringUtils.isEmpty(sysUserVo.getLawCertificateNum())){ |
|
|
|
lawCN=sysUserVo.getUserName() +" "+ CommonUtil.encryptPhone(sysUserVo.getPhonenumber()); |
|
|
|
} |
|
|
|
reg.setLawEnforcer(lawCN); |
|
|
|
} |
|
|
|
} catch (NumberFormatException e) { |
|
|
|
log.warn("无效的执法人员ID: {}", vo.getLawEnforcerId()); |
|
|
|
} |
|
|
|
reg.setLawEnforcer(lawCN); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -354,7 +360,11 @@ public class AppEnforcementRegistrationController extends BaseController { |
|
|
|
List<Long> userIds = new ArrayList<>(); |
|
|
|
for (String strid : ids) { |
|
|
|
if (StringUtils.isNotEmpty(strid.trim())) { |
|
|
|
userIds.add(Long.parseLong(strid.trim())); |
|
|
|
try { |
|
|
|
userIds.add(Long.parseLong(strid.trim())); |
|
|
|
} catch (NumberFormatException e) { |
|
|
|
log.warn("无效的其他执法人员ID: {}", strid); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (!userIds.isEmpty()) { |
|
|
|
|