Merge remote-tracking branch 'origin/upgrade' into upgrade

src/main/java/com/cm/population/controller/route/correct/CorrectRouteController.java

@@ -37,10 +37,11 @@ public class CorrectRouteController extends AbstractController {
     }
 
     @GetMapping("list")
-    public ModelAndView list(String populationInfoId) {
+    public ModelAndView list(String populationInfoId, String creator) {
         PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId);
         ModelAndView mv = new ModelAndView("correct/list");
         mv.addObject("dto", populationInfoDTO);
+        mv.addObject("creator", creator);
         return mv;
     }
 

src/main/java/com/cm/population/controller/route/cult/CultRouteController.java

@@ -40,10 +40,11 @@ public class CultRouteController extends AbstractController {
     }
 
     @GetMapping("list")
-    public ModelAndView list(String populationInfoId) {
+    public ModelAndView list(String populationInfoId, String creator) {
         PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId);
         ModelAndView mv = new ModelAndView("cult/list");
         mv.addObject("dto", populationInfoDTO);
+        mv.addObject("creator", creator);
         return mv;
     }
 }

src/main/java/com/cm/population/controller/route/dispute/DisputeRouteController.java

@@ -40,10 +40,11 @@ public class DisputeRouteController extends AbstractController {
     }
 
     @GetMapping("list")
-    public ModelAndView list(String populationInfoId) {
+    public ModelAndView list(String populationInfoId, String creator) {
         PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId);
         ModelAndView mv = new ModelAndView("dispute/list");
         mv.addObject("dto", populationInfoDTO);
+        mv.addObject("creator", creator);
         return mv;
     }
 }

src/main/java/com/cm/population/controller/route/drug/DrugRouteController.java

@@ -40,10 +40,11 @@ public class DrugRouteController extends AbstractController {
     }
 
     @GetMapping("list")
-    public ModelAndView list(String populationInfoId) {
+    public ModelAndView list(String populationInfoId, String creator) {
         PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId);
         ModelAndView mv = new ModelAndView("drug/list");
         mv.addObject("dto", populationInfoDTO);
+        mv.addObject("creator", creator);
         return mv;
     }
 }

src/main/java/com/cm/population/controller/route/petition/PetitionRouteController.java

@@ -40,10 +40,11 @@ public class PetitionRouteController extends AbstractController {
     }
 
     @GetMapping("list")
-    public ModelAndView list(String populationInfoId) {
+    public ModelAndView list(String populationInfoId, String creator) {
         PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId);
         ModelAndView mv = new ModelAndView("petition/list");
         mv.addObject("dto", populationInfoDTO);
+        mv.addObject("creator", creator);
         return mv;
     }
 

src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoRouteController.java

@@ -1,8 +1,11 @@
 package com.cm.population.controller.route.populationinfo;
 
 import com.cm.common.base.AbstractController;
+import com.cm.common.component.SecurityComponent;
 import com.cm.common.constants.ISystemConstant;
+import com.cm.common.pojo.bos.UserInfoBO;
 import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -18,6 +21,9 @@ import org.springframework.web.servlet.ModelAndView;
 @RequestMapping(ISystemConstant.ROUTE_PREFIX + "/populationinfo")
 public class PopulationInfoRouteController extends AbstractController {
 
+    @Autowired
+    protected SecurityComponent securityComponent;
+
     @GetMapping("save")
     public ModelAndView save() {
         return new ModelAndView("populationinfo/save");
@@ -33,6 +39,14 @@ public class PopulationInfoRouteController extends AbstractController {
         return new ModelAndView("populationinfo/list");
     }
 
+    @GetMapping("list-creator")
+    public ModelAndView listCreator() {
+        ModelAndView mv = new ModelAndView("populationinfo/list-creator");
+        UserInfoBO userInfoBO = this.securityComponent.getCurrentUser();
+        mv.addObject("creator", userInfoBO.getUserId());
+        return mv;
+    }
+
     @GetMapping("query")
     public ModelAndView query() {
         return new ModelAndView("populationinfo/query");

src/main/java/com/cm/population/controller/route/release/ReleaseRouteController.java

@@ -35,10 +35,11 @@ public class ReleaseRouteController extends AbstractController {
     }
 
     @GetMapping("list")
-    public ModelAndView list(String populationInfoId) {
+    public ModelAndView list(String populationInfoId, String creator) {
         PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId);
         ModelAndView mv = new ModelAndView("release/list");
         mv.addObject("dto", populationInfoDTO);
+        mv.addObject("creator", creator);
         return mv;
     }
 

src/main/java/com/cm/population/controller/route/security/SecurityRouteController.java

@@ -40,10 +40,11 @@ public class SecurityRouteController extends AbstractController {
     }
 
     @GetMapping("list")
-    public ModelAndView list(String populationInfoId) {
+    public ModelAndView list(String populationInfoId, String creator) {
         PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId);
         ModelAndView mv = new ModelAndView("security/list");
         mv.addObject("dto", populationInfoDTO);
+        mv.addObject("creator", creator);
         return mv;
     }
 

src/main/resources/mybatis/mapper/correct/correct-mapper.xml

@@ -248,6 +248,9 @@
         population_correct t1
         WHERE
         t1.is_delete = 0
+        <if test="creator != null and creator != ''">
+            AND t1.creator = #{creator}
+        </if>
         <if test="charge != null and charge != ''">
             AND t1.charge = #{charge}
         </if>

src/main/resources/mybatis/mapper/cult/cult-mapper.xml

@@ -264,6 +264,9 @@
         population_cult t1
         WHERE
         t1.is_delete = 0
+        <if test="creator != null and creator != ''">
+            AND t1.creator = #{creator}
+        </if>
         <if test="help != null and help != ''">
             AND t1.help = #{help}
         </if>

src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml

@@ -877,6 +877,9 @@
             t1.risk_level = t11.dictionary_id
         WHERE
             t1.is_delete = 0
+        <if test="creator != null and creator != ''">
+            AND t1.creator = #{creator}
+        </if>
         <if test="caseName != null and caseName != ''">
             AND t1.case_name LIKE CONCAT('%', #{caseName}, '%')
         </if>

src/main/resources/mybatis/mapper/drug/drug-mapper.xml

@@ -272,8 +272,11 @@
             population_drug t1
         WHERE
             t1.is_delete = 0
+        <if test="creator != null and creator != ''">
+            AND t1.creator = #{creator}
+        </if>
         <if test="controlPhone != null and controlPhone != ''">
-            AND t1.control_phone LIKE CONCAT('%', #{populationInfoId}, '%')
+            AND t1.control_phone LIKE CONCAT('%', #{controlPhone}, '%')
         </if>
         <if test="control != null and control != ''">
             AND t1.control = #{control}

src/main/resources/mybatis/mapper/petition/petition-mapper.xml

@@ -325,6 +325,9 @@
             t1.talk = t3.dictionary_id
         WHERE
             t1.is_delete = 0
+        <if test="creator != null and creator != ''">
+            AND t1.creator = #{creator}
+        </if>
         <if test="activation != null and activation != ''">
             AND t1.activation = #{activation}
         </if>

src/main/resources/mybatis/mapper/release/release-mapper.xml

@@ -248,6 +248,9 @@
             population_release t1
         WHERE
             t1.is_delete = 0
+        <if test="creator != null and creator != ''">
+            AND t1.creator = #{creator}
+        </if>
         <if test="charge != null and charge != ''">
             AND t1.charge = #{charge}
         </if>

src/main/resources/mybatis/mapper/security/security-mapper.xml

@@ -328,6 +328,9 @@
             population_security t1
         WHERE
             t1.is_delete = 0
+        <if test="creator != null and creator != ''">
+            AND t1.creator = #{creator}
+        </if>
         <if test="degree != null and degree != ''">
             AND t1.degree = #{degree}
         </if>

src/main/resources/templates/correct/list.html

@@ -98,7 +98,7 @@
         var laydate = layui.laydate;
         var common = layui.common;
         var resizeTimeout = null;
-        var tableUrl = 'api/correct/listpage?populationInfoId=[[${dto.populationInfoId}]]';
+        var tableUrl = 'api/correct/listpage?populationInfoId=[[${dto.populationInfoId}]]&creator=[[${creator}]]';
 
         // 初始化表格
         function initTable() {

src/main/resources/templates/cult/list.html

@@ -123,7 +123,7 @@
         var laydate = layui.laydate;
         var common = layui.common;
         var resizeTimeout = null;
-        var tableUrl = 'api/cult/listpage?populationInfoId=[[${dto.populationInfoId}]]';
+        var tableUrl = 'api/cult/listpage?populationInfoId=[[${dto.populationInfoId}]]&creator=[[${creator}]]';
 
         // 初始化涉邪代码下拉选择
         function initTypeSelect() {

src/main/resources/templates/dispute/list.html

@@ -129,7 +129,7 @@
         var laydate = layui.laydate;
         var common = layui.common;
         var resizeTimeout = null;
-        var tableUrl = 'api/dispute/listpage?populationInfoId=[[${dto.populationInfoId}]]';
+        var tableUrl = 'api/dispute/listpage?populationInfoId=[[${dto.populationInfoId}]]&creator=[[${creator}]]';
 
         // 初始化事件规模下拉选择
         function initCaseScaleSelect(selectValue) {

src/main/resources/templates/drug/list.html

@@ -135,7 +135,7 @@
         var laydate = layui.laydate;
         var common = layui.common;
         var resizeTimeout = null;
-        var tableUrl = 'api/drug/listpage?populationInfoId=[[${dto.populationInfoId}]]';
+        var tableUrl = 'api/drug/listpage?populationInfoId=[[${dto.populationInfoId}]]&creator=[[${creator}]]';
 
         // 初始化帮扶情况下拉选择
         function initHelpSelect() {

src/main/resources/templates/petition/list.html

@@ -150,7 +150,7 @@
         var laydate = layui.laydate;
         var common = layui.common;
         var resizeTimeout = null;
-        var tableUrl = 'api/petition/listpage?populationInfoId=[[${dto.populationInfoId}]]';
+        var tableUrl = 'api/petition/listpage?populationInfoId=[[${dto.populationInfoId}]]&creator=[[${creator}]]';
 
         // 初始化活跃度下拉选择
         function initActivationSelect() {

src/main/resources/templates/populationinfo/list-creator.html

@@ -0,0 +1,447 @@
+<!doctype html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <base th:href="${#request.getContextPath() + '/'}">
+    <meta charset="utf-8">
+    <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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-form-select{
+            min-width:200px!important;
+        }
+        .layui-select-title{
+            min-width:200px!important;
+        }
+        .layui-select-title input{
+            min-width:200px!important;
+        }
+    </style>
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn" style="margin-bottom: 10px;">
+                        <div class="layui-inline">
+                            <input type="text" id="name" class="layui-input search-item" placeholder="请输入姓名">
+                        </div>
+                        <div class="layui-inline layui-form search-item" id="idcardTypeSelectTemplateBox" lay-filter="idcardTypeSelectTemplateBox"></div>
+                        <div class="layui-inline">
+                            <input type="text" id="idcard" class="layui-input search-item" placeholder="请输入证件号">
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                    <!-- 表头按钮组 -->
+                    <script type="text/html" id="headerToolBar">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
+                                <i class="fa fa-lg fa-plus"></i> 新增
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
+                                <i class="fa fa-lg fa-edit"></i> 编辑
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
+                                <i class="fa fa-lg fa-trash"></i> 删除
+                            </button>
+                            <button type="button" class="layui-btn  layui-btn-sm" lay-event="correctEvent">
+                                社区矫正
+                            </button>
+                            <button type="button" class="layui-btn  layui-btn-sm" lay-event="releaseEvent">
+                                刑满释放
+                            </button>
+                            <button type="button" class="layui-btn  layui-btn-sm" lay-event="disputeEvent">
+                                矛盾纠纷
+                            </button>
+                            <button type="button" class="layui-btn  layui-btn-sm" lay-event="securityEvent">
+                                社会治安
+                            </button>
+                            <button type="button" class="layui-btn  layui-btn-sm" lay-event="drugEvent">
+                                吸毒人员
+                            </button>
+                            <button type="button" class="layui-btn  layui-btn-sm" lay-event="cultEvent">
+                                涉邪人员
+                            </button>
+                            <button type="button" class="layui-btn  layui-btn-sm" lay-event="petitionEvent">
+                                重点上访户
+                            </button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script id="idcardTypeSelectTemplate" type="text/html" lay-search>
+    <select id="idcardType" name="idcardType">
+        <option value="">请选择证件类型</option>
+        {{# for(var i = 0, item; item = d[i++];) { }}
+        <option value="{{item.dictionaryName}}">{{item.dictionaryName}}</option>
+        {{# } }}
+    </select>
+</script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'form', 'laytpl', 'laydate', 'common'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var table = layui.table;
+        var admin = layui.admin;
+        var laydate = layui.laydate;
+        var form = layui.form;
+        var laytpl = layui.laytpl;
+        var common = layui.common;
+        var resizeTimeout = null;
+        var tableUrl = 'api/populationinfo/listpage?creator=[[${creator}]]';
+
+        // 初始化证件类型下拉选择
+        function initIdcardTypeSelect() {
+            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) {
+                laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select', 'idcardTypeSelectTemplateBox');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initIdcardTypeSelect();
+
+        // 初始化表格
+        function initTable() {
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 90,
+                limit: 20,
+                limits: [20, 40, 60, 80, 100, 200],
+                toolbar: '#headerToolBar',
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [
+                    [
+                        {type:'checkbox', fixed: 'left'},
+                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                        {field: 'name', width: 180, title: '姓名', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'idcardType', width: 180, title: '证件类型', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'idcard', width: 180, title: '证件号码', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'birthday', width: 180, title: '出生日期', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'sex', width: 180, title: '性别', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'nation', width: 180, title: '民族', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        }
+                    ]
+                ],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                }
+            });
+        }
+        // 重载表格
+        function reloadTable(currentPage) {
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, []),
+                where: {
+                    name: $('#name').val(),
+                    idcardType: $('#idcardType').val(),
+                    idcard: $('#idcard').val()
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 90,
+            });
+        }
+
+        // 删除
+        function removeData(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/populationinfo/remove/{ids}', [ids]), {}, null, function (code, data) {
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
+                        reloadTable();
+                    }, function (code, data) {
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+        initTable();
+        // 事件 - 页面变化
+        $win.on('resize', function() {
+            clearTimeout(resizeTimeout);
+            resizeTimeout = setTimeout(function() {
+                reloadTable();
+            }, 500);
+        });
+        // 事件 - 搜索
+        $(document).on('click', '#search', function() {
+            reloadTable(1);
+        });
+        // 事件 - 增删改
+        table.on('toolbar(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            var checkStatus = table.checkStatus('dataTable');
+            var checkDatas = checkStatus.data;
+            if(layEvent === 'saveEvent') {
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: 0,
+                    area: ['100%', '100%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/populationinfo/save', []),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+            } else if(layEvent === 'updateEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    layer.open({
+                        type: 2,
+                        title: false,
+                        closeBtn: 0,
+                        area: ['100%', '100%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/populationinfo/update?populationInfoId={populationInfoId}', [checkDatas[0].populationInfoId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'removeEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectDelete);
+                } else {
+                    var ids = '';
+                    for(var i = 0, item; item = checkDatas[i++];) {
+                        if(i > 1) {
+                            ids += '_';
+                        }
+                        ids += item['populationInfoId'];
+                    }
+                    removeData(ids);
+                }
+            } else if(layEvent === 'correctEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    top.layer.open({
+                        type: 2,
+                        title: "社区矫正人员",
+                        closeBtn: 1,
+                        area: ['95%', '95%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/correct/list?populationInfoId={populationInfoId}&creator=[[${creator}]]', [checkDatas[0].populationInfoId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'releaseEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    top.layer.open({
+                        type: 2,
+                        title: "刑满释放人员",
+                        closeBtn: 1,
+                        area: ['95%', '95%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/release/list?populationInfoId={populationInfoId}&creator=[[${creator}]]', [checkDatas[0].populationInfoId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'disputeEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    top.layer.open({
+                        type: 2,
+                        title: "矛盾纠纷",
+                        closeBtn: 1,
+                        area: ['95%', '95%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/dispute/list?populationInfoId={populationInfoId}&creator=[[${creator}]]', [checkDatas[0].populationInfoId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'securityEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    top.layer.open({
+                        type: 2,
+                        title: "社会治安",
+                        closeBtn: 1,
+                        area: ['95%', '95%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/security/list?populationInfoId={populationInfoId}&creator=[[${creator}]]', [checkDatas[0].populationInfoId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'drugEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    top.layer.open({
+                        type: 2,
+                        title: "吸毒人员",
+                        closeBtn: 1,
+                        area: ['95%', '95%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/drug/list?populationInfoId={populationInfoId}&creator=[[${creator}]]', [checkDatas[0].populationInfoId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'cultEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    top.layer.open({
+                        type: 2,
+                        title: "涉邪人员",
+                        closeBtn: 1,
+                        area: ['95%', '95%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/cult/list?populationInfoId={populationInfoId}&creator=[[${creator}]]', [checkDatas[0].populationInfoId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'petitionEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    top.layer.open({
+                        type: 2,
+                        title: "重点上访户",
+                        closeBtn: 1,
+                        area: ['95%', '95%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/petition/list?populationInfoId={populationInfoId}&creator=[[${creator}]]', [checkDatas[0].populationInfoId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            }
+        });
+    });
+</script>
+</body>
+</html>

src/main/resources/templates/release/list.html

@@ -98,7 +98,7 @@
         var laydate = layui.laydate;
         var common = layui.common;
         var resizeTimeout = null;
-        var tableUrl = 'api/release/listpage?populationInfoId=[[${dto.populationInfoId}]]';
+        var tableUrl = 'api/release/listpage?populationInfoId=[[${dto.populationInfoId}]]&creator=[[${creator}]]';
 
         // 初始化表格
         function initTable() {

src/main/resources/templates/security/list.html

@@ -117,7 +117,7 @@
         var laydate = layui.laydate;
         var common = layui.common;
         var resizeTimeout = null;
-        var tableUrl = 'api/security/listpage?populationInfoId=[[${dto.populationInfoId}]]';
+        var tableUrl = 'api/security/listpage?populationInfoId=[[${dto.populationInfoId}]]&creator=[[${creator}]]';
 
         // 初始化处罚程度下拉选择
         function initDegreeSelect() {