修改权限赋值功能

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

@@ -1498,7 +1498,7 @@ public class PageController {
      * @return
      */
     @GetMapping("/userRoleInView")
-    public ModelAndView finduserRoleInView(Integer id) {
+    public ModelAndView findUserRoleInView(Integer id) {
         ModelAndView mv = new ModelAndView();
         mv.addObject("userId", id);
         mv.setViewName("pages/user/userRoleForIn");

src/main/java/com/dreamchaser/depository_manage/pojo/UserByPortP.java

@@ -81,6 +81,8 @@ public class UserByPortP {
      */
     private Integer personincharge;
 
+    private Integer maindeparment;
+
 
     public UserByPortP(UserByPort userByPort) {
         this.id = userByPort.getId();
@@ -96,6 +98,7 @@ public class UserByPortP {
         this.workpostname = userByPort.getWorkpostname();
         this.positionname = userByPort.getPositionname();
         this.personincharge = userByPort.getPersonincharge();
+        this.maindeparment = userByPort.getMaindeparment();
     }
 
     public UserByPortP(String number, String name, Integer state, Integer gender, Integer health, String mobilephone, String companyname, String maindeparmentname, String sunmaindeparmentname, String workpostname, String positionname) {

src/main/resources/templates/pages/application/application-out_min.html

@@ -90,12 +90,6 @@
             page: true,
             skin: 'line',
             done: function (res, curr, count) {
-                var data = res.data;
-                if (data.length > 0) {
-                    if (data[0].state === "进行中") {
-                        $("[data-field='id']").css('display', 'none');
-                    }
-                }
 
 
             }

src/main/resources/templates/pages/company/company-out.html

@@ -57,6 +57,7 @@
         <script type="text/html" id="currentTableBar">
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子类别</a>
             <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="detail">详情</a>
+            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="post">岗位</a>
         </script>
 
     </div>
@@ -166,7 +167,7 @@
                     layer.full(index);
                 });
                 return false;
-            } else if (obj.event == 'subclass') {
+            } else if (obj.event === 'subclass') {
                 var index = layer.open({
                     title: '子公司',
                     type: 2,
@@ -181,6 +182,21 @@
                 });
                 return false;
             }
+            else if (obj.event === 'post') {
+                var index = layer.open({
+                    title: '岗位列表',
+                    type: 2,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['100%', '100%'],
+                    content: '/findPostByOrganization?organization=' + data.id
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+                return false;
+            }
         })
     });
 </script>

src/main/resources/templates/pages/post/post-out.html

@@ -56,8 +56,8 @@
         <script type="text/html" id="currentTableBar">
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子类别</a>
             <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="detail">详情</a>
-            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="add_role">设置权限</a>
+<!--            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="add_role">设置权限</a>-->
-            <a class="layui-btn  layui-btn-xs layui-btn-warm" lay-event="addRoleIn">入库审核权</a>
+<!--            <a class="layui-btn  layui-btn-xs layui-btn-warm" lay-event="addRoleIn">入库审核权</a>-->
         </script>
 
     </div>
@@ -114,7 +114,19 @@
             limit: 10,
             page: true,
             skin: 'line',
-            done: function () {
+            done: function (res, curr, count) {
+                $.each(res['data'], function (i, j) {
+                    let administrativeorganization = j["administrativeorganization"];
+                    var controlItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[8];
+                    var aItem = controlItem.childNodes[0];
+                    if(administrativeorganization === 361){
+
+                        $(aItem).append('<a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleIn">设置权限</a>')
+                    }else{
+                        $(aItem).append('<a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="add_role">设置权限</a>')
+
+                    }
+                })
             }
         });
 
@@ -194,7 +206,6 @@
                 });
                 return false;
             }else if (obj.event === 'addRoleIn') {
-
                 var index = layer.open({
                     type: 2,
                     title: '权限信息',

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

@@ -63,7 +63,7 @@
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
 
         <script type="text/html" id="currentTableBar">
-            <a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleForIn">设置权限</a>
+<!--            <a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleForIn" >设置权限</a>-->
 <!--            <a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleForIn">设置权限</a>-->
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
 <!--            <a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="addRoleForIn">入库审核权</a>-->
@@ -151,7 +151,20 @@
             limit: 10,
             page: true,
             skin: 'line',
-            done: function () {
+            done: function (res, curr, count) {
+                $.each(res['data'], function (i, j) {
+                    let maindeparment = j["maindeparment"];
+
+                    var controlItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[11];
+                    var aItem = controlItem.childNodes[0];
+                    if(maindeparment === 361){
+
+                    $(aItem).append('<a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleForIn">设置权限</a>')
+                    }else{
+                    $(aItem).append('<a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="add_role">设置权限</a>')
+
+                    }
+                })
             }
         });
 

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

@@ -63,9 +63,10 @@
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
 
         <script type="text/html" id="currentTableBar">
-            <a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="add_role">设置权限</a>
+<!--            <a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleForIn" >设置权限</a>-->
+<!--            <a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleForIn">设置权限</a>-->
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
-            <a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="addRoleForIn">入库审核权</a>
+<!--            <a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="addRoleForIn">入库审核权</a>-->
         </script>
 
     </div>
@@ -150,7 +151,20 @@
             limit: 10,
             page: true,
             skin: 'line',
-            done: function () {
+            done: function (res, curr, count) {
+                $.each(res['data'], function (i, j) {
+                    let maindeparment = j["maindeparment"];
+
+                    var controlItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")").children()[11];
+                    var aItem = controlItem.childNodes[0];
+                    if(maindeparment === 361){
+
+                    $(aItem).append('<a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="addRoleForIn">设置权限</a>')
+                    }else{
+                    $(aItem).append('<a class="layui-btn layui-btn-xs layui-btn-danger " lay-event="add_role">设置权限</a>')
+
+                    }
+                })
             }
         });
 

target/classes/templates/pages/user/userRoleForIn.html

@@ -36,7 +36,7 @@
         //第一个实例
         table.render({
             elem: '#demo'
-            , url: '/findUserInRole?userId=' + userId+'&classes=1', //数据接口
+            , url: '/findUserInRole?uid=' + userId+'&classes=1', //数据接口
             parseData: function (res) { //res 即为原始返回的数据
                 return {
                     "status": res.status, //解析接口状态