用户删除修改

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/controller/AdminDoctorUserController.java

@@ -201,6 +201,10 @@ public class AdminDoctorUserController extends JeecgController<AdminUser, IAdmin
         queryWrapper.eq(AdminCompSelect::getDoctorAndSpecialist, "1");
         queryWrapper.eq(AdminCompSelect::getPhone, adminUser.getPhone());
         adminCompSelectService.remove(queryWrapper);
+        List<AdminCompSelect> list = adminCompSelectService.list(queryWrapper);
+        if (null == list || list.size() == 0) {
+            adminUserService.removeById(id);
+        }
         return Result.OK("删除成功!");
     }
 
@@ -223,7 +227,12 @@ public class AdminDoctorUserController extends JeecgController<AdminUser, IAdmin
             queryWrapper.eq(AdminCompSelect::getDoctorAndSpecialist, "1");
             queryWrapper.eq(AdminCompSelect::getPhone, adminUser.getPhone());
             adminCompSelectService.remove(queryWrapper);
+            List<AdminCompSelect> list = adminCompSelectService.list(queryWrapper);
+            if (null == list || list.size() == 0) {
+                this.adminUserService.removeByIds(Arrays.asList(ids.split(",")));
+            }
         }
+
         return Result.OK("批量删除成功!");
     }
 

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/controller/AdminSpecialistUserController.java

@@ -196,6 +196,10 @@ public class AdminSpecialistUserController extends JeecgController<AdminUser, IA
         queryWrapper.eq(AdminCompSelect::getDoctorAndSpecialist, "2");
         queryWrapper.eq(AdminCompSelect::getPhone, adminUser.getPhone());
         adminCompSelectService.remove(queryWrapper);
+        List<AdminCompSelect> list = adminCompSelectService.list(queryWrapper);
+        if (null == list || list.size() == 0) {
+            adminUserService.removeById(id);
+        }
 
 
         return Result.OK("删除成功!");
@@ -220,6 +224,10 @@ public class AdminSpecialistUserController extends JeecgController<AdminUser, IA
             queryWrapper.eq(AdminCompSelect::getDoctorAndSpecialist, "2");
             queryWrapper.eq(AdminCompSelect::getPhone, adminUser.getPhone());
             adminCompSelectService.remove(queryWrapper);
+            List<AdminCompSelect> list = adminCompSelectService.list(queryWrapper);
+            if (null == list || list.size() == 0) {
+                this.adminUserService.removeByIds(Arrays.asList(ids.split(",")));
+            }
         }
         return Result.OK("批量删除成功!");
     }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/service/impl/AdminUserServiceImpl.java

@@ -125,7 +125,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
 
         QueryWrapper<AdminUser> adminUserQueryWrapper = new QueryWrapper<>();
         adminUserQueryWrapper.eq("phone", phone);
-        adminUserQueryWrapper.eq("doctor_and_specialist", "1");
+//        adminUserQueryWrapper.eq("doctor_and_specialist", "1");
         AdminUser adminUsers = adminUserService.getOne(adminUserQueryWrapper);
 
         if (null != adminUsers) {
@@ -146,7 +146,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             adminCompSelectQueryWrapper.eq("phone", phone);
             adminCompSelectQueryWrapper.eq("comp_name", compName);
             adminCompSelectQueryWrapper.eq("sys_org_code", adminUser.getSysOrgCode());
-            adminCompSelectQueryWrapper.eq("doctor_and_specialist", "1");
+//            adminCompSelectQueryWrapper.eq("doctor_and_specialist", "1");
             List<AdminCompSelect> list = adminCompSelectService.list(adminCompSelectQueryWrapper);
 
             if (null != list && list.size() > 0) {
@@ -172,7 +172,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             adminCompSelectQueryWrapper.eq("phone", phone);
             adminCompSelectQueryWrapper.eq("comp_name", compName);
             adminCompSelectQueryWrapper.eq("sys_org_code", adminUser.getSysOrgCode());
-            adminCompSelectQueryWrapper.eq("doctor_and_specialist", "1");
+//            adminCompSelectQueryWrapper.eq("doctor_and_specialist", "1");
             List<AdminCompSelect> list = adminCompSelectService.list(adminCompSelectQueryWrapper);
 
             if (null != list && list.size() > 0) {
@@ -487,7 +487,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
 
         QueryWrapper<AdminUser> adminUserQueryWrapper = new QueryWrapper<>();
         adminUserQueryWrapper.eq("phone", phone);
-        adminUserQueryWrapper.eq("doctor_and_specialist", "2");
+//        adminUserQueryWrapper.eq("doctor_and_specialist", "2");
         AdminUser adminUsers = adminUserService.getOne(adminUserQueryWrapper);
 
         if (null != adminUsers) {
@@ -507,7 +507,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             adminCompSelectQueryWrapper.eq("phone", phone);
             adminCompSelectQueryWrapper.eq("comp_name", compName);
             adminCompSelectQueryWrapper.eq("sys_org_code", adminUser.getSysOrgCode());
-            adminCompSelectQueryWrapper.eq("doctor_and_specialist", "2");
+//            adminCompSelectQueryWrapper.eq("doctor_and_specialist", "2");
             List<AdminCompSelect> list = adminCompSelectService.list(adminCompSelectQueryWrapper);
 
             if (null != list && list.size() > 0) {
@@ -533,7 +533,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             adminCompSelectQueryWrapper.eq("phone", phone);
             adminCompSelectQueryWrapper.eq("comp_name", compName);
             adminCompSelectQueryWrapper.eq("sys_org_code", adminUser.getSysOrgCode());
-            adminCompSelectQueryWrapper.eq("doctor_and_specialist", "2");
+//            adminCompSelectQueryWrapper.eq("doctor_and_specialist", "2");
             List<AdminCompSelect> list = adminCompSelectService.list(adminCompSelectQueryWrapper);
 
             if (null != list && list.size() > 0) {