rev:任务管理查询按照人员区域权限查询

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java

@@ -17,6 +17,7 @@ import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.basedata.master.service.ClassstandardService;
 import org.nl.wms.basedata.master.service.dto.ClassstandardDto;
+import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl;
 import org.nl.wms.sch.service.PointService;
 import org.nl.wms.sch.service.RegionService;
 import org.nl.wms.sch.service.TaskService;
@@ -89,6 +90,12 @@ public class TaskServiceImpl implements TaskService {
         if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) {
             map.put("end_time", whereJson.getString("end_time"));
         }
+        //获取人员对应的区域
+        UserAreaServiceImpl userAreaService = new UserAreaServiceImpl();
+        String in_area_id = userAreaService.getInArea();
+        if (ObjectUtil.isNotEmpty(in_area_id)) {
+            map.put("in_area_id", in_area_id);
+        }
         JSONObject json = WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc");
         JSONArray content = json.getJSONArray("content");
         JSONArray res = new JSONArray();

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql

@@ -17,6 +17,7 @@
 	输入.task_status					             TYPEAS s_string
 	输入.finished_type					         TYPEAS s_string
 	输入.task_type					             TYPEAS f_string
+	输入.in_area_id					             TYPEAS f_string
 	输入.point_code1					             TYPEAS s_string
 	输入.point_code2					             TYPEAS s_string
 	输入.task_code					             TYPEAS s_string
@@ -49,10 +50,12 @@
 
     IF 输入.flag = "1"
 		PAGEQUERY
+            SELECT * FROM (
             SELECT
                 task.*,
                 md.class_name task_type_name,
-                    dict.label task_status_name
+                dict.label task_status_name,
+                case when task.task_type like '0105%' then 'LK' ELSE task.product_area end AS final_product_area
             FROM
                 sch_base_task task
                 LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
@@ -91,6 +94,11 @@
                ENDOPTION
                OPTION 输入.end_time <> ""
                    task.create_time <= 输入.end_time
+               ENDOPTION
+             ) a
+         WHERE 1=1
+            OPTION 输入.in_area_id <> ""
+                a.final_product_area IN 输入.in_area_id
             ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY

lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue

@@ -115,7 +115,7 @@ export default {
       level: 3,
       currentId: 0, menuLoading: false, showButton: false,
       menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
-      tableData: [{ 'product_area': 'A1' }, { 'product_area': 'A2' }, { 'product_area': 'A3' }, { 'product_area': 'A4' }],
+      tableData: [{ 'product_area': 'A1' }, { 'product_area': 'A2' }, { 'product_area': 'A3' }, { 'product_area': 'A4' }, { 'product_area': 'LK' }],
       currentRow: null,
       permission: {
         add: ['admin', 'roles:add'],