1

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java

@@ -1487,84 +1487,85 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             List<SmsCheckCustomerInfo> list = customerInfoService.list(checkCustomerInfoLambdaQueryWrapper);
 
             List<String> ids = list.stream().map(SmsCheckCustomerInfo::getId).collect(Collectors.toList());
-
-            LambdaQueryWrapper<SmsLotCustomerData> lambdaQueryWrapper = new LambdaQueryWrapper<SmsLotCustomerData>()
-                    .in(SmsLotCustomerData::getInfoId, ids);
-            List<SmsLotCustomerData> smsLotCustomerDataList = smsLotCustomerService.list(lambdaQueryWrapper);
-
-            LambdaQueryWrapper<SmsTruckCustomerData> truckCustomerDataLambdaQueryWrapper = new LambdaQueryWrapper<SmsTruckCustomerData>()
-                    .in(SmsTruckCustomerData::getInfoId, ids);
-            List<SmsTruckCustomerData> truckCustomerData = smsTruckCustomerDataService.list(truckCustomerDataLambdaQueryWrapper);
-
-            LambdaQueryWrapper<SmsCheckCustomerData> smsCustomerInfoGroupByCheckStates = new LambdaQueryWrapper<SmsCheckCustomerData>()
-                    .in(SmsCheckCustomerData::getInfoId, ids);
-            List<SmsCheckCustomerData> checkCustomerData = customerDataService.list(smsCustomerInfoGroupByCheckStates);
-
-            LambdaQueryWrapper<SpecialExamination> specialExaminationLambdaQueryWrapper = new LambdaQueryWrapper<SpecialExamination>()
-                    .in(SpecialExamination::getInfoId, ids);
-            List<SpecialExamination> specialExaminations = specialExaminationService.list(specialExaminationLambdaQueryWrapper);
-
             List<FilesDataVo> filesDataVos =new ArrayList<>();
-            for (SmsLotCustomerData lotCustomerData : smsLotCustomerDataList) {
-                Class<? extends SmsLotCustomerData> aClass = lotCustomerData.getClass();
-                Field[] declaredFields = aClass.getDeclaredFields();
-                for (Field declaredField : declaredFields) {
-                    declaredField.setAccessible(true);
-                    Object value = declaredField.get(lotCustomerData);
-                    if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")) {
-                        if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
-                            List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
-                            filesDataVos.addAll(filesDataVos1);
+            if (ids.size()>0){
+                LambdaQueryWrapper<SmsLotCustomerData> lambdaQueryWrapper = new LambdaQueryWrapper<SmsLotCustomerData>()
+                        .in(SmsLotCustomerData::getInfoId, ids);
+                List<SmsLotCustomerData> smsLotCustomerDataList = smsLotCustomerService.list(lambdaQueryWrapper);
+
+                LambdaQueryWrapper<SmsTruckCustomerData> truckCustomerDataLambdaQueryWrapper = new LambdaQueryWrapper<SmsTruckCustomerData>()
+                        .in(SmsTruckCustomerData::getInfoId, ids);
+                List<SmsTruckCustomerData> truckCustomerData = smsTruckCustomerDataService.list(truckCustomerDataLambdaQueryWrapper);
+
+                LambdaQueryWrapper<SmsCheckCustomerData> smsCustomerInfoGroupByCheckStates = new LambdaQueryWrapper<SmsCheckCustomerData>()
+                        .in(SmsCheckCustomerData::getInfoId, ids);
+                List<SmsCheckCustomerData> checkCustomerData = customerDataService.list(smsCustomerInfoGroupByCheckStates);
+
+                LambdaQueryWrapper<SpecialExamination> specialExaminationLambdaQueryWrapper = new LambdaQueryWrapper<SpecialExamination>()
+                        .in(SpecialExamination::getInfoId, ids);
+                List<SpecialExamination> specialExaminations = specialExaminationService.list(specialExaminationLambdaQueryWrapper);
+
+
+                for (SmsLotCustomerData lotCustomerData : smsLotCustomerDataList) {
+                    Class<? extends SmsLotCustomerData> aClass = lotCustomerData.getClass();
+                    Field[] declaredFields = aClass.getDeclaredFields();
+                    for (Field declaredField : declaredFields) {
+                        declaredField.setAccessible(true);
+                        Object value = declaredField.get(lotCustomerData);
+                        if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")) {
+                            if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
+                                List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
+                                filesDataVos.addAll(filesDataVos1);
+                            }
                         }
                     }
                 }
-            }
-            for (SmsTruckCustomerData smsTruckCustomerData : truckCustomerData) {
-                Class<? extends SmsTruckCustomerData> aClass = smsTruckCustomerData.getClass();
-                Field[] declaredFields = aClass.getDeclaredFields();
-                for (Field declaredField : declaredFields) {
-                    declaredField.setAccessible(true);
-                    Object value = declaredField.get(smsTruckCustomerData);
-                    if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")) {
-                        if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
-                            List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
-                            filesDataVos.addAll(filesDataVos1);
+                for (SmsTruckCustomerData smsTruckCustomerData : truckCustomerData) {
+                    Class<? extends SmsTruckCustomerData> aClass = smsTruckCustomerData.getClass();
+                    Field[] declaredFields = aClass.getDeclaredFields();
+                    for (Field declaredField : declaredFields) {
+                        declaredField.setAccessible(true);
+                        Object value = declaredField.get(smsTruckCustomerData);
+                        if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")) {
+                            if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
+                                List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
+                                filesDataVos.addAll(filesDataVos1);
+                            }
                         }
                     }
                 }
-            }
-            for (SmsCheckCustomerData customerData : checkCustomerData) {
-                Class<? extends SmsCheckCustomerData> aClass = customerData.getClass();
-                Field[] declaredFields = aClass.getDeclaredFields();
-                for (Field declaredField : declaredFields) {
-                    declaredField.setAccessible(true);
-                    Object value = declaredField.get(customerData);
-                    if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")&& !value.toString().isEmpty()) {
-                        if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
-                            List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
-                            filesDataVos.addAll(filesDataVos1);
+                for (SmsCheckCustomerData customerData : checkCustomerData) {
+                    Class<? extends SmsCheckCustomerData> aClass = customerData.getClass();
+                    Field[] declaredFields = aClass.getDeclaredFields();
+                    for (Field declaredField : declaredFields) {
+                        declaredField.setAccessible(true);
+                        Object value = declaredField.get(customerData);
+                        if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")&& !value.toString().isEmpty()) {
+                            if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
+                                List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
+                                filesDataVos.addAll(filesDataVos1);
+                            }
                         }
                     }
                 }
-            }
-            for (SpecialExamination specialExamination : specialExaminations) {
-                Class<? extends SpecialExamination> aClass = specialExamination.getClass();
-                Field[] declaredFields = aClass.getDeclaredFields();
-                for (Field declaredField : declaredFields) {
-                    declaredField.setAccessible(true);
-                    Object value = declaredField.get(specialExamination);
-                    if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")) {
-                        if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
-                            List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
-                            filesDataVos.addAll(filesDataVos1);
+                for (SpecialExamination specialExamination : specialExaminations) {
+                    Class<? extends SpecialExamination> aClass = specialExamination.getClass();
+                    Field[] declaredFields = aClass.getDeclaredFields();
+                    for (Field declaredField : declaredFields) {
+                        declaredField.setAccessible(true);
+                        Object value = declaredField.get(specialExamination);
+                        if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")) {
+                            if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
+                                List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
+                                filesDataVos.addAll(filesDataVos1);
+                            }
                         }
                     }
                 }
+                for (FilesDataVo filesDataVo : filesDataVos) {
+                    filesDataVo.setUid(filesDataVo.getId());
+                }
             }
-            for (FilesDataVo filesDataVo : filesDataVos) {
-                filesDataVo.setUid(filesDataVo.getId());
-            }
-
             return Result.ok(JSON.toJSONString(filesDataVos));
         } catch (Exception e) {
             throw new RuntimeException(e);

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -126,6 +126,51 @@ public class SysUserController {
             }
             //update-end---author:wangshuai ---date:20220322  for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------
         }
+        //部门name
+        String departName = req.getParameter("departName");
+        if (StringUtils.isNotBlank(departName)){
+            departName=departName.replace("*","");
+
+            if(oConvertUtils.isNotEmpty(departName)){
+                LambdaQueryWrapper<SysDepart> queryDepart = new LambdaQueryWrapper<>();
+                queryDepart.like(SysDepart::getDepartName,departName);
+                List<SysDepart> listDeparts = sysDepartService.list(queryDepart);
+
+                List<String> ids = listDeparts.stream().map(SysDepart::getId).collect(Collectors.toList());
+                if (ids.isEmpty()){
+                    return Result.OK();
+                }
+                LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<>();
+                query.in(SysUserDepart::getDepId,ids);
+                List<SysUserDepart> list = sysUserDepartService.list(query);
+                List<String> userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());
+                //update-begin---author:wangshuai ---date:20220322  for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------
+                if(oConvertUtils.listIsNotEmpty(userIds)){
+                    queryWrapper.in("id",userIds);
+                }else{
+                    return Result.OK();
+                }
+                //update-end---author:wangshuai ---date:20220322  for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------
+            }
+        }
+        //角色id
+        String selectedroles = req.getParameter("selectedroles");
+        if (StringUtils.isNotBlank(selectedroles)) {
+            selectedroles=selectedroles.replace("*","");
+            if(oConvertUtils.isNotEmpty(selectedroles)){
+                String[] split = selectedroles.split(",");
+                LambdaQueryWrapper<SysUserRole> query = new LambdaQueryWrapper<>();
+                query.in(SysUserRole::getRoleId,split);
+                List<SysUserRole> list = userRoleService.list(query);
+                List<String> userIds = list.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
+                //update-begin---author:wangshuai ---date:20220322  for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------
+                if(oConvertUtils.listIsNotEmpty(userIds)){
+                    queryWrapper.in("id",userIds);
+                }else{
+                    return Result.OK();
+                }
+            }
+        }
         //用户ID
         String code = req.getParameter("code");
         if(oConvertUtils.isNotEmpty(code)){