|
|
@ -275,7 +275,11 @@ public class AppEnforcementRegistrationController extends BaseController |
|
|
|
|
|
|
|
|
// 执法人员1需要展示用户名+执法码
|
|
|
// 执法人员1需要展示用户名+执法码
|
|
|
UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); |
|
|
UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); |
|
|
String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum(); |
|
|
|
|
|
|
|
|
String lawCN = userBean.getLawCertificateNum(); |
|
|
|
|
|
if(StringUtils.isEmpty(lawCN)){ |
|
|
|
|
|
lawCN=CommonUtil.encryptPhone(userBean.getPhonenumber()); |
|
|
|
|
|
} |
|
|
ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN); |
|
|
ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN); |
|
|
|
|
|
|
|
|
// 执法人员2需要展示用户名+执法码
|
|
|
// 执法人员2需要展示用户名+执法码
|
|
|
@ -285,8 +289,11 @@ public class AppEnforcementRegistrationController extends BaseController |
|
|
userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); |
|
|
userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); |
|
|
} |
|
|
} |
|
|
for (UserBean ub : userBeans) { |
|
|
for (UserBean ub : userBeans) { |
|
|
String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); |
|
|
String temp = ub.getLawCertificateNum(); |
|
|
lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum); |
|
|
if(StringUtils.isEmpty(temp)){ |
|
|
|
|
|
temp=CommonUtil.encryptPhone(ub.getPhonenumber()); |
|
|
|
|
|
} |
|
|
|
|
|
lawTwoList.add(ub.getUserName() +" "+ temp); |
|
|
} |
|
|
} |
|
|
ee.setLawEnforcer2List(lawTwoList); |
|
|
ee.setLawEnforcer2List(lawTwoList); |
|
|
|
|
|
|
|
|
|