用户列表显示

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

@@ -90,44 +90,37 @@ public class AdminDoctorUserController extends JeecgController<AdminUser, IAdmin
             adminCompSelectLambdaQueryWrapper.eq("sys_org_code", sysUser.getOrgCode());
         }
         adminCompSelectLambdaQueryWrapper.eq("doctor_and_specialist", "1");
-
+        if (ssname != null) {
+            adminCompSelectLambdaQueryWrapper.like("name", ssname);
+        }
+        if (ssphone != null) {
+            adminCompSelectLambdaQueryWrapper.like("phone", ssphone);
+        }
+        if (ssksname != null) {
+            adminCompSelectLambdaQueryWrapper.like("ks_name", ssksname);
+        }
+        if (ssdwname != null) {
+            adminCompSelectLambdaQueryWrapper.like("dw_name", ssdwname);
+        }
 
         List<AdminCompSelect> list = adminCompSelectService.list(adminCompSelectLambdaQueryWrapper);
         Page<AdminUser> pageList = new Page<>();
 
         for (AdminCompSelect adminCompSelect : list) {
-            String orderId = adminCompSelect.getOrderId();
 
-            if (ssname != null) {
-                queryWrapper.like("name", ssname);
-            }
-            if (ssphone != null) {
-                queryWrapper.like("phone", ssphone);
-            }
-            if (ssksname != null) {
-                queryWrapper.like("ksname", ssksname);
-            }
-            if (ssdwname != null) {
-                queryWrapper.like("dwname", ssdwname);
-            }
-            queryWrapper.eq("id", orderId);
-            Page<AdminUser> page = new Page<AdminUser>(pageNo, pageSize);
-            pageList = adminUserService.page(page, queryWrapper);
-
-            List<AdminUser> records = pageList.getRecords();
-            for (AdminUser record : records) {
-                record.setAvatar(adminCompSelect.getAvatar());
-                record.setCardPic(adminCompSelect.getCardPic());
-                record.setKsname(adminCompSelect.getKsName());
-                record.setDwname(adminCompSelect.getDwName());
-                record.setName(adminCompSelect.getName());
-                record.setCard(adminCompSelect.getCard());
-                record.setBackCard(adminCompSelect.getBackCard());
-                record.setBackName(adminCompSelect.getBackName());
-                record.setWisMhu(adminCompSelect.getWisMhu());
-                record.setWisWjdc(adminCompSelect.getWisWjdc());
-                adminUsers.add(record);
-            }
+            AdminUser record = new AdminUser();
+            record.setAvatar(adminCompSelect.getAvatar());
+            record.setCardPic(adminCompSelect.getCardPic());
+            record.setPhone(adminCompSelect.getPhone());
+            record.setKsname(adminCompSelect.getKsName());
+            record.setDwname(adminCompSelect.getDwName());
+            record.setName(adminCompSelect.getName());
+            record.setCard(adminCompSelect.getCard());
+            record.setBackCard(adminCompSelect.getBackCard());
+            record.setBackName(adminCompSelect.getBackName());
+            record.setWisMhu(adminCompSelect.getWisMhu());
+            record.setWisWjdc(adminCompSelect.getWisWjdc());
+            adminUsers.add(record);
 
         }
 

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

@@ -85,41 +85,34 @@ public class AdminSpecialistUserController extends JeecgController<AdminUser, IA
         }
         adminCompSelectLambdaQueryWrapper.eq("doctor_and_specialist", "2");
         List<AdminCompSelect> list = adminCompSelectService.list(adminCompSelectLambdaQueryWrapper);
-
+        if (ssname != null) {
+            adminCompSelectLambdaQueryWrapper.like("name", ssname);
+        }
+        if (ssphone != null) {
+            adminCompSelectLambdaQueryWrapper.like("phone", ssphone);
+        }
+        if (ssksname != null) {
+            adminCompSelectLambdaQueryWrapper.like("ks_name", ssksname);
+        }
+        if (ssdwname != null) {
+            adminCompSelectLambdaQueryWrapper.like("dw_name", ssdwname);
+        }
         for (AdminCompSelect adminCompSelect : list) {
-            String orderId = adminCompSelect.getOrderId();
-
-            if (ssname != null) {
-                queryWrapper.like("name", ssname);
-            }
-            if (ssphone != null) {
-                queryWrapper.like("phone", ssphone);
-            }
-            if (ssksname != null) {
-                queryWrapper.like("ksname", ssksname);
-            }
-            if (ssdwname != null) {
-                queryWrapper.like("dwname", ssdwname);
-            }
-            queryWrapper.eq("id", orderId);
-
-            Page<AdminUser> page = new Page<AdminUser>(pageNo, pageSize);
-            pageList = adminUserService.page(page, queryWrapper);
-            List<AdminUser> records = pageList.getRecords();
-            for (AdminUser record : records) {
-                record.setAvatar(adminCompSelect.getAvatar());
-                record.setCardPic(adminCompSelect.getCardPic());
-                record.setKsname(adminCompSelect.getKsName());
-                record.setDwname(adminCompSelect.getDwName());
-                record.setName(adminCompSelect.getName());
-                record.setCard(adminCompSelect.getCard());
-                record.setBackCard(adminCompSelect.getBackCard());
-                record.setBackName(adminCompSelect.getBackName());
-                record.setWisMhu(adminCompSelect.getWisMhu());
-                record.setWisWjdc(adminCompSelect.getWisWjdc());
-                adminUsers.add(record);
-            }
+            AdminUser record = new AdminUser();
+            record.setPhone(adminCompSelect.getPhone());
+            record.setAvatar(adminCompSelect.getAvatar());
+            record.setCardPic(adminCompSelect.getCardPic());
+            record.setKsname(adminCompSelect.getKsName());
+            record.setDwname(adminCompSelect.getDwName());
+            record.setName(adminCompSelect.getName());
+            record.setCard(adminCompSelect.getCard());
+            record.setBackCard(adminCompSelect.getBackCard());
+            record.setBackName(adminCompSelect.getBackName());
+            record.setWisMhu(adminCompSelect.getWisMhu());
+            record.setWisWjdc(adminCompSelect.getWisWjdc());
+            adminUsers.add(record);
         }
+
         pageList.setRecords(adminUsers);
 
 

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

@@ -393,6 +393,15 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
                 baseCommonService.addLog("用户校验失败，用户不存在！", CommonConstant.LOG_TYPE_1, null);
                 return Result.error("token校验该用户不存在");
             }
+            QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
+            adminCompSelectQueryWrapper.eq("phone",userPhone);
+            adminCompSelectQueryWrapper.eq("sys_org_code",storeMember1.getSysOrgCode());
+            AdminCompSelect one = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
+            if (null!=one){
+                storeMember1.setYzh(one.getYzh());
+
+            }
+
             String yzh = storeMember1.getYzh();
             if ("1".equals(yzh)) {
                 //银行卡四要素认证(上传验证码)