Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java

@@ -81,6 +81,7 @@ public class AppEnfCpPlanController extends EfcodeCpPlanController {
     @GetMapping("/reserve/check/{targetPlanId}")
     public R<Void> checkCanReserve(@PathVariable String targetPlanId) {
         return cpReserveService.checkCanReserve(targetPlanId);
+
     }
 
     /**

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

@@ -130,7 +130,7 @@ public class AppEnfLoginController extends LoginController {
         data.put("loginName", user.getLoginName());
         data.put("nickName", user.getNickName());
         data.put("phonenumber", phonenumber != null ? phonenumber : "");
-        data.put("lawCertificateNum", user.getNickName());
+        data.put("lawCertificateNum", user.getLawCertificateNum());
         data.put("deptId", user.getDeptId());
         data.put("deptName", sysDept.getDeptName());
 
@@ -222,7 +222,7 @@ public class AppEnfLoginController extends LoginController {
             data.put("loginName", user.getLoginName());
             data.put("nickName", user.getNickName());
             data.put("phonenumber", phonenumber != null ? phonenumber : "");
-            data.put("lawCertificateNum", user.getNickName());
+            data.put("lawCertificateNum", user.getLawCertificateNum());
             data.put("deptId", user.getDeptId());
             data.put("deptName", sysDept.getDeptName());
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java

@@ -47,7 +47,7 @@ public class AppEntLoginController extends LoginController {
         }
 
         // 2. 根据登录名和用户类型查询用户
-        EnterpriseUserVo user = enterpriseUserService.queryByLoginNameAndUserType(secretName, "00");
+        EnterpriseUserVo user = enterpriseUserService.queryByLoginNameAndUserType(secretName, "app_user");
         if (user == null) {
             return R.fail("用户不存在");
         }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java

@@ -16,9 +16,9 @@ import java.io.Serial;
  * @date 2026-05-19
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 @TableName("non_enforcement_registration")
-public class NonEnforcementRegistration extends BaseEntity {
+public class NonEnforcementRegistration {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -184,5 +184,7 @@ public class NonEnforcementRegistration extends BaseEntity {
      */
     private String reason;
 
+    private String createBy;
+
 
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/NonEnforcementRegistrationVo.java

@@ -233,4 +233,5 @@ public class NonEnforcementRegistrationVo implements Serializable {
      */
     private String area;
 
+    private String createBy;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserServiceImpl.java

@@ -196,7 +196,7 @@ public class EnterpriseUserServiceImpl implements IEnterpriseUserService {
     public EnterpriseUserVo queryByLoginNameAndUserType(String loginName, String userType) {
         LambdaQueryWrapper<EnterpriseUser> lqw = Wrappers.lambdaQuery();
         lqw.eq(EnterpriseUser::getLoginName, loginName);
-        lqw.eq(EnterpriseUser::getUserType, userType);
+        lqw.eq(EnterpriseUser::getDelFlag, "0");
         return baseMapper.selectVoOne(lqw);
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml

@@ -26,7 +26,7 @@
             </choose>
         FROM sys_user u
         LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
-        WHERE u.del_flag = '0' and d.dept_id != 405
+        WHERE u.del_flag = '0' and d.dept_id != 405 and u.user_name != 'admin'
         <if test="!globalSearch and sysDeptId != null and sysDeptId != ''">
             AND (u.dept_id = #{sysDeptId} OR u.dept_id IN (
                 SELECT t.dept_id FROM sys_dept t WHERE t.del_flag = '0' AND FIND_IN_SET(#{sysDeptId}, t.ancestors)

zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue

@@ -113,8 +113,8 @@ const { t } = useI18n();
 
 const loginForm = ref<LoginData>({
   tenantId: '000000',
-  username: 'admin',
+  username: '',
-  password: 'admin123',
+  password: '',
   rememberMe: false,
   code: '',
   uuid: ''
@@ -153,17 +153,7 @@ interface TestUser {
 }
 
 const testUsers = ref<TestUser[]>([
-  { label: '超级管理员', tenantId: '000000', username: 'admin', password: 'szsf@zfjd' },
+
-  { label: '深圳市司法局-刘倩琳', tenantId: '000000', username: 'liuqianlin', password: 'szsf@zfjd' },
-  { label: '深圳市审计局-杜啟艺', tenantId: '000000', username: 'duqiyi', password: 'szsf@zfjd' },
-  { label: '深圳市龙岗区司法局-黄占海', tenantId: '000000', username: 'huangzhanhai', password: 'szsf@zfjd' },
-  { label: '深圳市南山区司法局-梁有志', tenantId: '000000', username: 'liangyouzhi', password: 'szsf@zfjd' },
-  { label: '深圳市坪山区司法局-李旺', tenantId: '000000', username: 'liwang4', password: 'szsf@zfjd' },
-  { label: '深圳市光明区司法局-李振禧', tenantId: '000000', username: 'lizhenxi', password: 'szsf@zfjd' },
-  { label: '深圳市光明区司法局-王亚伟', tenantId: '000000', username: 'wangyawei3', password: 'szsf@zfjd' },
-  { label: '光明区光明街道-梁紫微', tenantId: '000000', username: 'liangziwei', password: 'szsf@zfjd' },
-  { label: '光明区公明街道-郑尚', tenantId: '000000', username: 'zhengshang', password: 'szsf@zfjd' },
-  { label: '光明区马田街道-吴志伟', tenantId: '000000', username: 'wuzhiwei5', password: 'szsf@zfjd' }
 ]);
 
 const selectTestUser = (user: TestUser) => {

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

@@ -88,14 +88,7 @@ const navigateTo = (target) => {
     }
 };
 const testUsers = [
-    {loginUserId:"0001002",account: 'cuifengyuan', name: '崔峰源', password: 'szsf@zfjd',bureauUnitName:"深圳市司法局"},
+
-    {loginUserId:"0001001",account: 'liuqianlin', name: '刘倩琳', password: 'szsf@zfjd',bureauUnitName:"深圳市司法局"},
-    {loginUserId:"0001003",account: 'baining', name: '白宁', password: 'szsf@zfjd',bureauUnitName:"深圳市坪山区司法局"},
-    {loginUserId:"0001004",account: 'caizifan', name: '蔡梓帆', password: 'szsf@zfjd',bureauUnitName:"深圳市福田区司法局"},
-    {loginUserId:"0001005",account: 'chenchong4', name: '陈冲', password: 'szsf@zfjd',bureauUnitName:"深圳市宝安区司法局"},
-    {loginUserId:"0001006",account: 'chenggaozhan', name: '程高展', password: 'szsf@zfjd',bureauUnitName:"深圳市南山区司法局"},
-    {loginUserId:"0001007",account: 'chenhaitao2', name: '陈海涛', password: 'szsf@zfjd',bureauUnitName:"深圳市南山区司法局"},
-    {loginUserId:"0001008",account: 'chenhanyu', name: '陈汉羽', password: 'szsf@zfjd',bureauUnitName:"深圳市坪山区司法局"}
 ];
 
 const selectTestUser = (item) => {

zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue

@@ -52,14 +52,7 @@
     const isLocalhost = ref(window.location.hostname === 'localhost');
     const showTestPicker = ref(false);
     const testEnterprises = [
-        { account: 'free_kylin', name: '新粤云（深圳）信息技术有限公司', password: 'szsf@zfjd' },
+
-        { account: 'weil45', name: '深圳农牧美益肉业有限公司', password: 'szsf@zfjd' },
-        { account: 'DGD440881199506180622', name: '深圳市深水龙岗污水处理有限公司', password: 'szsf@zfjd' },
-        { account: 'smiledzb1982', name: '深圳康泰生物制品股份有限公司', password: 'szsf@zfjd' },
-        { account: 'A7271888', name: '深圳市里程食品有限公司', password: 'szsf@zfjd' },
-        { account: 'qintongzhen138', name: '欧姆龙电子部件（深圳）有限公司', password: 'szsf@zfjd' },
-        { account: 'XP073215', name: '深圳市强达电路股份有限公司', password: 'szsf@zfjd' },
-        { account: '33ef1970fd449676fa4bc197', name: '吉田拉链（深圳）有限公司公明工厂', password: 'szsf@zfjd' },
     ];
 
     const selectTestEnterprise = (item) => {