zhuibobo
/
EnforcementCode-2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

注销机构参与的权限部分 .

dev-V1.0.5.1
蟑螂恶霸 2 months ago
parent
48e2812dd8
commit
dc66e5ba1d
3 changed files with 42 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java
  2. 17
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue
  3. 17
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue

38
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java
View File

@ -109,9 +109,10 @@ public class AppEnfLoginController extends LoginController {
// 验证关键组织信息不能为空
if (srzOrgan == null) {
return R.fail("该用户未关联认证机构，无法登录执法端");
}
// 市认证机构非登录硬门槛，无映射时允许登录，organ 字段回空
// if (srzOrgan == null) {
// return R.fail("该用户未关联认证机构，无法登录执法端");
// }
if (sysDept == null) {
return R.fail("该用户未关联部门，无法登录执法端");
}
@ -153,11 +154,15 @@ public class AppEnfLoginController extends LoginController {
data.put("deptId", user.getDeptId());
data.put("deptName", sysDept.getDeptName());
data.put("organId", srzOrgan.getOrganizationid());
data.put("organName", srzOrgan.getName());
// data.put("organId", srzOrgan.getOrganizationid());
// data.put("organName", srzOrgan.getName());
data.put("organId", srzOrgan != null ? srzOrgan.getOrganizationid() : "");
data.put("organName", srzOrgan != null ? srzOrgan.getName() : "");
data.put("bureauUnitId", bureauDept.getDeptId());
data.put("bureauUnitName", bureauDept.getDeptName());
// data.put("bureauUnitId", bureauDept.getDeptId());
// data.put("bureauUnitName", bureauDept.getDeptName());
data.put("bureauUnitId", bureauDept != null ? bureauDept.getDeptId() : "");
data.put("bureauUnitName", bureauDept != null ? bureauDept.getDeptName() : "");
data.put("lawOfficer", isLawOfficer);
data.put("platformType", PlatformTypeEnums.ENFORCEMENT.getKey());
return R.ok(data);
@ -221,9 +226,10 @@ public class AppEnfLoginController extends LoginController {
// 验证关键组织信息不能为空
if (srzOrgan == null) {
return R.fail("该用户未关联认证机构，无法登录执法端");
}
// 市认证机构非登录硬门槛，无映射时允许登录，organ 字段回空
// if (srzOrgan == null) {
// return R.fail("该用户未关联认证机构，无法登录执法端");
// }
if (sysDept == null) {
return R.fail("该用户未关联部门，无法登录执法端");
}
@ -253,11 +259,15 @@ public class AppEnfLoginController extends LoginController {
data.put("deptId", user.getDeptId());
data.put("deptName", sysDept.getDeptName());
data.put("organId", srzOrgan.getOrganizationid());
data.put("organName", srzOrgan.getName());
// data.put("organId", srzOrgan.getOrganizationid());
// data.put("organName", srzOrgan.getName());
data.put("organId", srzOrgan != null ? srzOrgan.getOrganizationid() : "");
data.put("organName", srzOrgan != null ? srzOrgan.getName() : "");
data.put("bureauUnitId", bureauDept.getDeptId());
data.put("bureauUnitName", bureauDept.getDeptName());
// data.put("bureauUnitId", bureauDept.getDeptId());
// data.put("bureauUnitName", bureauDept.getDeptName());
data.put("bureauUnitId", bureauDept != null ? bureauDept.getDeptId() : "");
data.put("bureauUnitName", bureauDept != null ? bureauDept.getDeptName() : "");
data.put("lawOfficer", isLawOfficer);
data.put("platformType", PlatformTypeEnums.ENFORCEMENT.getKey());
return R.ok(data);

17
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue
View File

@ -107,14 +107,15 @@ const doLogin = (secretName, secretKey) => {
showFailToast("该用户未关联部门，无法登录");
return;
}
if (!response.data.organId) {
showFailToast("该用户未关联认证机构，无法登录");
return;
}
if (!response.data.bureauUnitId) {
showFailToast("该用户未关联执法单位，无法登录");
return;
}
// 市认证机构/执法单位非登录硬门槛，无映射时允许登录并继续写 token
// if (!response.data.organId) {
// showFailToast("该用户未关联认证机构，无法登录");
// return;
// }
// if (!response.data.bureauUnitId) {
// showFailToast("该用户未关联执法单位，无法登录");
// return;
// }
// 执法端登录成功 → 赋值用户基本信息
useCommon.SET_USER_PHONENUMBER(response.data.phonenumber || "");
useCommon.SET_USER_ID(response.data.userId);

17
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue
View File

@ -106,14 +106,15 @@ const doLogin = (secretName, secretKey) => {
showFailToast("该用户未关联部门，无法登录");
return;
}
if (!response.data.organId) {
showFailToast("该用户未关联认证机构，无法登录");
return;
}
if (!response.data.bureauUnitId) {
showFailToast("该用户未关联执法单位，无法登录");
return;
}
// 市认证机构/执法单位非登录硬门槛，无映射时允许登录并继续写 token
// if (!response.data.organId) {
// showFailToast("该用户未关联认证机构，无法登录");
// return;
// }
// if (!response.data.bureauUnitId) {
// showFailToast("该用户未关联执法单位，无法登录");
// return;
// }
// 执法端登录成功 → 赋值用户基本信息
useCommon.SET_USER_PHONENUMBER(response.data.phonenumber || "");
useCommon.SET_USER_ID(response.data.userId);

Write Preview
Loading…
Cancel
Save