2025-04-10

src/main/java/com/spring/modules/project/controller/ProjectController.java

@@ -103,6 +103,13 @@ public class ProjectController {
         return R.ok().put("rows", rows);
     }
 
+    @PostMapping(value="/searchSelectionUserRole")
+    @ResponseBody
+    public R searchSelectionUserRole(@RequestBody PlmUserRoleData data){
+        List<PlmUserRoleData> rows  = projectService.searchSelectionUserRole(data);
+        return R.ok().put("rows", rows);
+    }
+
     @PostMapping(value="/saveProjectInfo")
     @ResponseBody
     public R saveProjectInfo(@RequestBody PlmProjectInfoData data){

src/main/java/com/spring/modules/project/service/ProjectService.java

@@ -216,4 +216,6 @@ public interface ProjectService {
     CustomerInformationVo queryProjectCustomer(PlmProjectInfo project);
 
     CustomerInformationEntity queryProjectFinalCustomer(PlmProjectInfo project);
+
+    List<PlmUserRoleData> searchSelectionUserRole(PlmUserRoleData data);
 }

src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -112,6 +113,41 @@ public class ProjectServiceImpl implements ProjectService {
                     BeanUtils.copyProperties(dataCheckList.get(index), plmUserRoleData);
                 }
             }
+//            else {
+//                if("Y".equals(list.get(i).getSearchFlag()) && "Y".equals(list.get(i).getUpdateFlag()) && "Y".equals(list.get(i).getDownFlag()) && "Y".equals(list.get(i).getDeleteFlag())){
+//                    list.get(i).setCheckAll(true);
+//                }
+//                if("Y".equals(list.get(i).getSearchFlag())){
+//                    list.get(i).setSearchCheck(true);
+//                }
+//                if("Y".equals(list.get(i).getUpdateFlag())){
+//                    list.get(i).setUpdateCheck(true);
+//                }
+//                if("Y".equals(list.get(i).getDownFlag())){
+//                    list.get(i).setDownCheck(true);
+//                }
+//                if("Y".equals(list.get(i).getDeleteFlag())){
+//                    list.get(i).setDeleteCheck(true);
+//                }
+//            }
+        }
+
+        return list;
+    }
+
+    @Override
+    public List<PlmUserRoleData> searchSelectionUserRole(PlmUserRoleData data) {
+        // 获得请求人
+        List<PlmUserRoleData> list=projectDao.searchUserRoll(data);
+        List<PlmUserRoleData> dataCheckList = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            PlmUserRoleData plmUserRoleData = list.get(i);
+            plmUserRoleData.setSearchCheck(false);
+            plmUserRoleData.setUpdateCheck(false);
+            plmUserRoleData.setDownCheck(false);
+            plmUserRoleData.setDeleteCheck(false);
+            plmUserRoleData.setCheckAll(false);
+            // 新增需要这个
             if("Y".equals(list.get(i).getSearchFlag()) && "Y".equals(list.get(i).getUpdateFlag()) && "Y".equals(list.get(i).getDownFlag()) && "Y".equals(list.get(i).getDeleteFlag())){
                 list.get(i).setCheckAll(true);
             }
@@ -127,9 +163,11 @@ public class ProjectServiceImpl implements ProjectService {
             if("Y".equals(list.get(i).getDeleteFlag())){
                 list.get(i).setDeleteCheck(true);
             }
+            if("Y".equals(list.get(i).getSearchFlag()) || "Y".equals(list.get(i).getUpdateFlag()) || "Y".equals(list.get(i).getDownFlag()) || "Y".equals(list.get(i).getDeleteFlag())){
+                dataCheckList.add(list.get(i));
+            }
         }
-
-        return list;
+        return dataCheckList;
     }
 
     @Override