添加仓库对外开放页面

src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java

@@ -423,6 +423,20 @@ public class CompanyController {
         return new RestResponse(list);
     }
 
+    /**
+     * 获取行政组织与岗位树
+     */
+    @GetMapping("/getOrgAndPostThree")
+    public RestResponse getOrgAndPostThree(HttpServletRequest request){
+        List<Object> list = new ArrayList<>();
+        String token = request.getHeader("user-token");
+        if (token == null) {
+            token = (String) request.getSession().getAttribute("userToken");
+        }
+        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
+        return new RestResponse(companyService.BuildOrgAndPostThree(userToken));
+    }
+
 
     /**
      * 用于创建施工单位

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java

@@ -1412,11 +1412,12 @@ public class DepositoryController {
             list = depositoryService.InitTreeMenus("", userToken);
         } else {
             list = depositoryService.InitTreeMenus(adminorg.toString(), userToken);
-
         }
         return new RestResponse(list);
     }
 
+
+
     // 构造库位树
     @GetMapping("/treeMenus_Place")
     public RestResponse InitTreeMenus_Place(@RequestParam(value = "depositoryId") Integer depositoryId) {
@@ -1425,6 +1426,13 @@ public class DepositoryController {
         return new RestResponse(list);
     }
 
+    @GetMapping("/treeMenusOnlyDepository")
+    public RestResponse treeMenusOnlyDepository(){
+        List<Object> list = new ArrayList<>();
+        list = depositoryService.InitTreeMenusOnlyDepository();
+        return new RestResponse(list);
+    }
+
     // 根据id获取仓库信息
     @GetMapping("/findDepositoryByDid")
     public RestResponse findDepositoryByDid(@RequestParam(value = "depositoryId") Integer depositoryId) {

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -3298,5 +3298,14 @@ public class PageController {
     }
 
 
+    /**
+     * 用来跳转到仓库对外开放页面
+     */
+    @GetMapping("/depositoryRole")
+    public ModelAndView depositoryRole(){
+        ModelAndView mv = new ModelAndView();
+        mv.setViewName("pages/authorization/depositoryOpen");
+        return mv;
+    }
 
 }

src/main/java/com/dreamchaser/depository_manage/service/CompanyService.java

@@ -1,5 +1,7 @@
 package com.dreamchaser.depository_manage.service;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.dreamchaser.depository_manage.entity.Company;
 import com.dreamchaser.depository_manage.entity.User;
 import com.dreamchaser.depository_manage.entity.UserByPort;
@@ -114,4 +116,12 @@ public interface CompanyService {
      * 用于构造企业微信行政组织结构
      */
     List<Object> BuildQyWxAdministrationTreeMenus(UserByPort userByPort,String UserAgent);
+
+
+    /**
+     * 用于构造行政组织及岗位树
+     * @param userByPort 当前登录用户
+     * @return
+     */
+    JSONArray BuildOrgAndPostThree(UserByPort userByPort);
 }

src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java

@@ -154,6 +154,15 @@ public interface DepositoryService {
      * @return
      */
     List<Object> InitTreeMenus(String adminorg,UserByPort userByPort);
+
+
+    /**
+     * 构造仓库树
+     * @return
+     */
+    List<Object> InitTreeMenusOnlyDepository();
+
+
     /**
      * 获取当前部门以及公共仓库
      * @param adminorg

src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java

@@ -258,6 +258,21 @@ public class CompanyServiceImpl implements CompanyService {
         return list;
     }
 
+    /**
+     * 用于构造行政组织及岗位树
+     * @param userByPort 当前登录用户
+     * @return
+     */
+    @Override
+    public JSONArray BuildOrgAndPostThree(UserByPort userByPort) {
+        JSONArray orgAndPostThree = LinkInterfaceUtil.getOrgAndPostThree(userByPort);
+        // 将获取到的json字符串进行修改为使用的结构
+        String replace = JSONObject.toJSONString(orgAndPostThree).replace("name", "title").replace("child", "children");
+        // 将其变回json格式
+        return JSONObject.parseArray(replace);
+    }
+
+
 
 
     /**

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java

@@ -395,6 +395,17 @@ public class DepositoryServiceImpl implements DepositoryService {
         return list;
     }
 
+    /**
+     * 构造仓库树
+     * @return
+     */
+    @Override
+    public List<Object> InitTreeMenusOnlyDepository() {
+        List<Object> list = new ArrayList<>();
+        list = buildTree_New(InitOnlyDepositoryTree(), 0);
+        return list;
+    }
+
 
     /**
      * 根据多个主键id获取对应数据
@@ -805,8 +816,7 @@ public class DepositoryServiceImpl implements DepositoryService {
 
             // 定义开启线程数
             Integer openThreadSize = 0;
-            for (int i = 0; i < depositories.size(); i++) {
+            for (Depository depository : depositories) {
-                Depository depository = depositories.get(i);
                 if ("".equals(adminorg) || "361".equals(adminorg)) { // 如果不按部门分类或是仓储中心人员，则全部加载
                     Future<Object> submit = completionService.submit(new PlaceTask(depository));
                     futureList.add(submit);
@@ -858,4 +868,100 @@ public class DepositoryServiceImpl implements DepositoryService {
     }
 
 
+    /**
+     * 用于获取只有仓库的树结构
+     * @return
+     */
+    public List<Object> InitOnlyDepositoryTree() {
+        // 定义结果集
+        List<Object> list = new ArrayList<>();
+
+        // 定义仓库id列表
+        List<Integer> depositoryIdList = new ArrayList<>();
+        // 获取所有仓库
+        List<Depository> depositoryAll = depositoryMapper.findDepositoryAll();
+        Integer totalVal = depositoryAll.size();
+
+        // 定义分页数量
+        double size = 10.0;
+
+        // 定义线程数
+        Integer threadSize = (int) Math.ceil(totalVal / size);
+
+        // 定义开启线程数目
+        Integer openThreadSize = 0;
+        // 开启对应数量的线程
+        ExecutorService exs = Executors.newFixedThreadPool(threadSize);
+        // 线程结果集
+        List<Future<Object>> futureList = new ArrayList<Future<Object>>();
+
+        // 1.定义CompletionService
+        CompletionService<Object> completionService = new ExecutorCompletionService<Object>(exs);
+        for (int i = 0; i < depositoryAll.size(); i++) {
+            // 获取当前类型
+            Depository depository = depositoryAll.get(i);
+            if (((i + 1) % 10) == 0) { // 如果有10个开启线程进行处理
+                depositoryIdList.add(depository.getId());
+                Future<Object> future = completionService.submit(new TaskForOnlyDepository(depositoryIdList));
+                openThreadSize++;
+                futureList.add(future); // 添加到结果集
+                depositoryIdList = new ArrayList<>(); // 情况列表
+            } else {
+                // 添加id到列表中
+                depositoryIdList.add(depository.getId());
+            }
+        }
+
+        if (depositoryIdList.size() > 0) {
+            // 如果有剩余，开启线程进行处理
+            Future<Object> future = completionService.submit(new TaskForOnlyDepository(depositoryIdList));
+            futureList.add(future);
+            openThreadSize++;
+        }
+
+        // 3.获取结果
+        for (int i = 0; i < openThreadSize; i++) {
+            Object result = null;
+            try {
+                result = completionService.take().get();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            } catch (ExecutionException e) {
+                e.printStackTrace();
+            }
+            list.addAll((Collection<?>) result);
+        }
+        exs.shutdown();
+        // 用于判断当前列表中是否有所有上级
+        return list;
+    }
+
+    /**
+     * 用于构造树结构
+     */
+    class TaskForOnlyDepository implements Callable<Object>{
+
+        List<Integer> depositoryIdList;
+
+        public TaskForOnlyDepository(List<Integer> depositoryIdList) {
+            this.depositoryIdList = depositoryIdList;
+        }
+
+        @Override
+        public Object call() throws Exception {
+            /**
+             * 获取当前仓库id对应的仓库
+             */
+            List<Depository> depositories = depositoryMapper.selectDepositoryByIds(depositoryIdList);
+            List<Object> result = new ArrayList<>();
+            for (Depository depository:depositories
+            ) {
+                Map<String, Object> stringObjectMap = InitTreeMenus2(depository, new ArrayList<>());
+                result.add(stringObjectMap);
+            }
+            return result;
+        }
+    }
+
+
 }

src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java

@@ -325,9 +325,15 @@ public class LinkInterfaceUtil {
         }
         JSONObject jsonObject = JSONObject.parseObject(post);
         return (JSONArray) jsonObject.get("data");
+
     }
 
 
+    /**
+     * 获取当前用户可见的菜单集
+     * @param userToken 当前登录用户
+     * @return
+     */
     public static List<String> getUserAccessToAddresses(UserByPort userToken) {
         //定义链接地址
         String url = PortConfig.external_url_6666 + "/system_authorizing/obtain_authorization";
@@ -350,5 +356,26 @@ public class LinkInterfaceUtil {
         List<String> stringList = JSONObject.parseArray(powerid.toJSONString(), String.class);
         return stringList;
     }
+
+
+    public static JSONArray getOrgAndPostThree(UserByPort userToken){
+        //定义链接地址
+        String url = PortConfig.external_url + "/org/get_organdpost_three";
+        Map<String, Object> param = new HashMap<>();
+        param.put("id", "309");
+        param.put("level", 0);
+        param.put("all", 0);
+        String jsonString = JSONObject.toJSONString(param);
+        JSONObject paramObject = JSONObject.parseObject(jsonString);
+        String post = null;
+        try {
+            post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userToken);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        JSONObject jsonObject = JSONObject.parseObject(post);
+        JSONObject data = (JSONObject) jsonObject.get("data");
+        return data.getJSONArray("list");
+    }
 }
 

src/main/resources/templates/pages/authorization/depositoryOpen.html

@@ -0,0 +1,272 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <title>layui</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
+    <link rel="stylesheet" href="/static/css/public.css" media="all">
+    <link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
+
+</head>
+<body>
+<div class="layuimini-container">
+    <div class="layui-row">
+        <div class="layui-col-md8">
+            <div class="layui-tab" lay-filter="roleSet">
+                <ul class="layui-tab-title">
+                    <li class="layui-this" tabType="person">人员</li>
+                    <li tabType="post">岗位</li>
+                </ul>
+                <div class="layui-tab-content">
+                    <div class="layui-tab-item layui-show">
+                        <form class="layui-form layui-form-pane" action="">
+                            <div class="layui-form-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">人员姓名</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" name="name" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">人员工号</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" name="number" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <button type="submit" class="layui-btn layui-btn-primary" lay-submit
+                                            lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
+                                    </button>
+                                </div>
+                            </div>
+                        </form>
+                        <table class="layui-hide" id="currentTableForUser"
+                               lay-filter="currentTableFilterForUser"></table>
+                    </div>
+                    <div class="layui-tab-item">
+                        <div id="postTree" class="demo-tree"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-md4">
+            <div id="depositoryTree" class="demo-tree"></div>
+            <button type="button" class="layui-btn layui-btn-primary layui-border-blue" onclick="Impower()">授权</button>
+        </div>
+    </div>
+</div>
+
+<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
+
+<script>
+
+
+    function Impower() {
+
+    }
+
+    // 用于标志是否为第一次提交
+    let flagForForm = false;
+    layui.use(['form', 'layer', 'tree', 'element', 'table'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            tree = layui.tree,
+            element = layui.element,
+            table = layui.table,
+            layer = layui.layer;
+
+
+        let tabType = "person";
+
+        let depositoryTree;
+        let postTree;
+        element.on('tab(roleSet)', function (data) {
+            tabType = $(this).attr("tabType");
+            if (tabType === "post") {
+                $.ajax({
+                    url: "/company/getOrgAndPostThree",
+                    type: 'get',
+                    dataType: 'json',
+                    contentType: "application/json;charset=utf-8",
+                    beforeSend: function () {
+                    },
+                    success: function (d) {
+                        var data2 = d.data;
+                        postTree.reload({
+                            data: data2
+                        });
+                    },
+
+                });
+            } else {
+                table.reload('currentTableForUser', {
+                    url: '/sys/findUsers',
+                    page: {
+                        curr: 1
+                    },
+                }, 'data');
+            }
+
+        });
+
+        table.render({
+            elem: '#currentTableForUser',
+            url: '/sys/findUsers',
+            method: "POST",
+            parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "status": res.status, //解析接口状态
+                    "message": res.statusInfo.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.data //解析数据列表
+                };
+            },
+            height: 'full-255',//固定高度-即固定表头固定第一行首行
+            request: {
+                pageName: 'page', //页码的参数名称，默认：page
+                limitName: 'size' //每页数据量的参数名，默认：limit
+            },
+            response: {
+                statusName: 'status' //规定数据状态的字段名称，默认：code
+                , statusCode: 200 //规定成功的状态码，默认：0
+                , msgName: 'message' //规定状态信息的字段名称，默认：msg
+                , countName: 'count' //规定数据总数的字段名称，默认：count
+                , dataName: 'data' //规定数据列表的字段名称，默认：data
+            },
+            cols: [
+                [
+                    {type: "checkbox", width: 50},
+                    {field: 'number', width: 100, title: '工号', sort: true},
+                    {field: 'name', width: 100, title: '姓名'},
+                    {
+                        field: 'gender', width: 80, title: '性别', templet: function (d) {
+                            if (d.gender === 1) {
+                                return "男性";
+                            } else if (d.gender === 2) {
+                                return "女性";
+                            } else if (d.gender === 3) {
+                                return "中性";
+                            } else {
+                                return "";
+                            }
+                        }
+                    },
+                    {field: 'companyname', width: 200, title: '公司名称'},
+                    {field: 'maindeparmentname', width: 200, title: '主部门'},
+                    {field: 'sunmaindeparmentname', width: 200, title: '岗位'},
+                    {field: 'workpostname', width: 200, title: '工段'},
+                    {field: 'positionname', width: 200, title: '职位'}
+                ]
+            ],
+            limits: [10, 15, 20, 25, 50, 100],
+            limit: 10,
+            page: true,
+            skin: 'line',
+        });
+
+        form.on('submit(data-search-btn)', function (data) {
+            data = data.field;
+            let req = {};
+            if (data.name !== '') {
+                req.name = data.name;
+            }
+            if (data.number !== '') {
+                req.number = data.number;
+            }
+            //执行搜索重载
+            table.reload('currentTableForUser', {
+                url: '/sys/findUsers',
+                page: {
+                    curr: 1
+                },
+                where: req
+            }, 'data');
+            return false;
+        });
+
+
+        depositoryTree = tree.render({
+            elem: '#depositoryTree'
+            , id: "depositoryTree"
+            , showCheckbox: true  //是否显示复选框
+            , data: []
+        });
+        $.ajax({
+            url: "/repository/treeMenusOnlyDepository",
+            type: 'get',
+            dataType: 'json',
+            contentType: "application/json;charset=utf-8",
+            beforeSend: function () {
+            },
+            success: function (d) {
+                var data2 = d.data;
+                depositoryTree.reload({
+                    data: data2
+                });
+            },
+
+        });
+
+        postTree = tree.render({
+            elem: '#postTree'
+            , id: "postTree"
+            , showCheckbox: true  //是否显示复选框
+            , data: []
+        });
+
+
+        Impower = function () {
+            let treeData = tree.getChecked('depositoryTree');
+            // 获取选中的Id
+            let userIds = [];
+            if (tabType === "person") {
+                let checkUserData = table.checkStatus('currentTableForUser').data;
+                for (let i = 0, len = checkUserData.length; i < len; i++) {
+                    userIds.push(checkUserData[i].id);
+                }
+            } else {
+                userIds = getAllTreeId(tree.getChecked('postTree'));
+            }
+            // 获取选中的仓库树id
+            let allTreeId = getAllTreeId(treeData);
+
+            console.log(userIds)
+            console.log(allTreeId)
+
+        };
+
+
+        /**
+         * 用于获取选中树的id
+         * @param data
+         */
+        function getAllTreeId(data) {
+            // 用于存储id
+            let idList = [];
+            for (let i = 0; i < data.length; i++) {
+                let temp = data[i];
+                if (temp.orgid !== undefined) {
+                    if (temp.orgid === "-1") {
+                        idList.push(temp.id);
+                    }
+                } else {
+                    idList.push(temp.id);
+                }
+                if (temp.children !== null && temp.children !== undefined && temp.children.length > 0) {
+                    // 如果存在子树
+                    idList.push(...getAllTreeId(temp.children));
+                }
+            }
+            return idList;
+        }
+
+    });
+
+
+</script>
+
+</body>
+</html>

src/main/resources/templates/pages/user/table-user.html

@@ -205,7 +205,7 @@
                 dataType: 'json',
                 contentType: "application/json;charset=utf-8",
                 success: function (d) {
-                    if (data.value != "") {
+                    if (data.value !== "") {
 
                         $('#adminorg').empty();
                         $('#adminorg').append(new Option("请选择部门", ""));

src/main/resources/templates/pages/warehouse/selectOnlyDepository.html

@@ -10,7 +10,6 @@
     <link rel="stylesheet" href="/static/css/public.css" media="all">
 </head>
 <body>
-<input id="adminorg" name="adminorg" th:value="${adminorg}" style="display: none">
 <div id="test2" class="demo-tree"></div>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
@@ -20,47 +19,13 @@
 
         var $ = layui.jquery,
             tree = layui.tree;
-        var adminorg = $("#adminorg").val();
             test = tree.render({
                 elem: '#test2'
+                ,showCheckbox: true  //是否显示复选框
                 ,data: []
-                ,onlyIconControl: true  //是否仅允许节点左侧图标控制展开收缩
-                ,click: function(obj){
-                    var data = obj.data;
-                    if(data.id === -1 ){
-                        return false;
-                    }
-                    // 用于判断是库位还是仓库
-                    var flag = false;
-                    var dataId = data.id;
-                    if(typeof dataId === "string"){
-                        flag = true;
-                    }
-                    if(!flag) {
-                        $("#openSonByDepository",window.parent.document).val(obj.data.title);
-                        $("#depositoryId",window.parent.document).val(obj.data.id);
-                        $("#placeId",window.parent.document).val(0);
-                    }else{
-                        var did = dataId.split("-");
-                        $.ajax({
-                            url: "/repository/findDepositoryByDid?depositoryId=0" + did[0],
-                            type: 'get',
-                            dataType: 'json',
-                            contentType: "application/json;charset=utf-8",
-                            success:function (d) {
-                                $("#openSonByDepository",window.parent.document).val(d.data.dname +"-"+ obj.data.title);
-                            }
-                        });
-                        $("#depositoryId",window.parent.document).val(did[0]);
-                        $("#placeId",window.parent.document).val(did[1]);
-                    }
-
-                    var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
-                }
             });
         $.ajax({
-            url: "/repository/treeMenus?adminorg=0"+adminorg,
+            url: "/repository/treeMenus?adminorg=0",
             type: 'get',
             dataType: 'json',
             contentType: "application/json;charset=utf-8",

src/test/java/com/dreamchaser/depository_manage/OtherTest.java

@@ -1,78 +1,37 @@
 package com.dreamchaser.depository_manage;
 
-import com.dreamchaser.depository_manage.entity.StockTaking;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.dreamchaser.depository_manage.entity.Depository;
 import com.dreamchaser.depository_manage.entity.UserByPort;
-import com.dreamchaser.depository_manage.pojo.*;
+import com.dreamchaser.depository_manage.mapper.DepositoryMapper;
-import com.dreamchaser.depository_manage.service.DepositoryRecordService;
-import com.dreamchaser.depository_manage.service.StockTakingService;
 import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
+import java.util.concurrent.*;
-import java.util.List;
-import java.util.Map;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class OtherTest {
 
     @Autowired
-    DepositoryRecordService depositoryRecordService;
+    DepositoryMapper depositoryMapper;
-
-    @Autowired
-    StockTakingService stockTakingService;
-    @Autowired
-    RedisTemplate<String,String> redisTemplateForHash;
 
     @Test
     public void Test(){
         UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null);
-        List<SimpleTaskP> userSimpleTaskP = getUserSimpleApplyP(userByPort);
-        System.out.println(userSimpleTaskP);
-    }
-
-
-    /**
-     * 用于获取当前用户的任务列表
-     * @param userToken 当前用户
-     * @return
-     */
-    public List<SimpleTaskP> getUserSimpleApplyP(UserByPort userToken){
-        Map<String, Object> paramForApply = new HashMap<>();
-        paramForApply.put("applicantId", userToken.getId());
-        paramForApply.put("size", 4);
-        paramForApply.put("page", 1);
 
-        // 定义任务列表
+        JSONArray orgAndPostThree = LinkInterfaceUtil.getOrgAndPostThree(userByPort);
-        List<SimpleTaskP> list = new ArrayList<>();
+        System.out.println(JSONObject.toJSONString(orgAndPostThree).replace("name","title").replace("child","children"));
-
-        // 查询入库申请
-        List<ApplicationInRecordP> applicationInRecordPByCondition = depositoryRecordService.findApplicationInRecordPByCondition(paramForApply, userToken);
-        for (ApplicationInRecordP applicationInRecordP : applicationInRecordPByCondition) {
-            SimpleTaskP simpleTask = new SimpleTaskP(applicationInRecordP);
-            list.add(simpleTask);
     }
 
 
-        List<ApplicationOutRecordP> applicationOutRecordPlist = depositoryRecordService.findApplicationOutRecordPByCondition(paramForApply, userToken);
-        for (ApplicationOutRecordP applicationOutRecordP : applicationOutRecordPlist) {
-            SimpleTaskP simpleTask = new SimpleTaskP(applicationOutRecordP);
-            list.add(simpleTask);
-        }
 
-        paramForApply.put("originator",userToken.getId());
+
-        List<StockTaking> stockTakingByCondition = stockTakingService.findStockTakingByCondition(paramForApply);
-        for (StockTaking stockTaking : stockTakingByCondition) {
-            SimpleTaskP simpleTask = new SimpleTaskP(new SimpleStockTakingP(stockTaking));
-            list.add(simpleTask);
-        }
-        return list;
-    }
 
 }

target/classes/templates/pages/user/table-user.html

@@ -205,7 +205,7 @@
                 dataType: 'json',
                 contentType: "application/json;charset=utf-8",
                 success: function (d) {
-                    if (data.value != "") {
+                    if (data.value !== "") {
 
                         $('#adminorg').empty();
                         $('#adminorg').append(new Option("请选择部门", ""));

target/classes/templates/pages/warehouse/selectOnlyDepository.html

@@ -10,7 +10,6 @@
     <link rel="stylesheet" href="/static/css/public.css" media="all">
 </head>
 <body>
-<input id="adminorg" name="adminorg" th:value="${adminorg}" style="display: none">
 <div id="test2" class="demo-tree"></div>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
@@ -20,47 +19,13 @@
 
         var $ = layui.jquery,
             tree = layui.tree;
-        var adminorg = $("#adminorg").val();
             test = tree.render({
                 elem: '#test2'
+                ,showCheckbox: true  //是否显示复选框
                 ,data: []
-                ,onlyIconControl: true  //是否仅允许节点左侧图标控制展开收缩
-                ,click: function(obj){
-                    var data = obj.data;
-                    if(data.id === -1 ){
-                        return false;
-                    }
-                    // 用于判断是库位还是仓库
-                    var flag = false;
-                    var dataId = data.id;
-                    if(typeof dataId === "string"){
-                        flag = true;
-                    }
-                    if(!flag) {
-                        $("#openSonByDepository",window.parent.document).val(obj.data.title);
-                        $("#depositoryId",window.parent.document).val(obj.data.id);
-                        $("#placeId",window.parent.document).val(0);
-                    }else{
-                        var did = dataId.split("-");
-                        $.ajax({
-                            url: "/repository/findDepositoryByDid?depositoryId=0" + did[0],
-                            type: 'get',
-                            dataType: 'json',
-                            contentType: "application/json;charset=utf-8",
-                            success:function (d) {
-                                $("#openSonByDepository",window.parent.document).val(d.data.dname +"-"+ obj.data.title);
-                            }
-                        });
-                        $("#depositoryId",window.parent.document).val(did[0]);
-                        $("#placeId",window.parent.document).val(did[1]);
-                    }
-
-                    var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
-                }
             });
         $.ajax({
-            url: "/repository/treeMenus?adminorg=0"+adminorg,
+            url: "/repository/treeMenus?adminorg=0",
             type: 'get',
             dataType: 'json',
             contentType: "application/json;charset=utf-8",