bug修改

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/LabourApiController.java

@@ -70,10 +70,6 @@ public class LabourApiController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("create_time","desc"));
 
-            if(!userService.hasRole(user.getId(),"SYSADMIN")&&!userService.hasRole(user.getId(),"ADMIN")){
-                searchParams.put("userId", user.getId());
-            }
-
             if (StringUtils.isNotEmpty(approvalStatus)) {
                 searchParams.put("approvalStatus",approvalStatus);
             }

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RecruitmentApiController.java

@@ -387,9 +387,44 @@ public class RecruitmentApiController {
         searchParams.put("status", 1);
         searchParams.put("approveStatus", 3);
 
+        Page<Map> page = recruitmentService.foundPageList(searchParams,1,5,true,sortList);
 
+        for (Map map:page) {
+            List<String> welfareList = new ArrayList<>();
+            Object tagListN = map.get("tagList");
+            if(tagListN != null){
+                JSONObject jsonObject = JSONObject.fromObject(tagListN.toString());
+                if(jsonObject!=null&&jsonObject.size()>0) {
+                    String checkboxGroup1="";
+                    String dynamicTags="";
+                    if(jsonObject.get("checkboxGroup1")!=null){
+                        checkboxGroup1 = jsonObject.get("checkboxGroup1").toString();
+                    }
+                    if(jsonObject.get("dynamicTags")!=null){
+                        dynamicTags = jsonObject.get("dynamicTags").toString();
+                    }
+                    if(StringUtils.isNotEmpty(checkboxGroup1)){
+                        String[] checkboxGroupArray = checkboxGroup1.split(",");
+                        for (String dicId:checkboxGroupArray) {
+                            DataDictionary dataDictionary = dataDictionaryService.get(dicId);
+                            if(dataDictionary!=null){
+                                welfareList.add(dataDictionary.getName());
+                            }
+                        }
+                    }
+                    if(StringUtils.isNotEmpty(dynamicTags)){
+                        String[] dynamicTagArray = dynamicTags.split(",");
+                        for (String name:dynamicTagArray) {
+                            welfareList.add(name);
+                        }
+                    }
+                }
+                map.put("tagList",welfareList.toArray());
+            } else {
+                map.put("tagList","");
+            }
 
-        Page<Map> page = recruitmentService.foundPageList(searchParams,1,5,true,sortList);
+        }
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));