修改内蒙森林公安局查询不出本单位及下级单位用户；完善用户使用字典代码框的方式，提升用户体验；修复角色和权限的查询bug;修改翻页丢失用户查询参数的bug.

src/main/java/com/xzxtshiro/controller/ShiroHandler.java

@@ -37,7 +37,6 @@ public class ShiroHandler {
 			// rememberme
 			token.setRememberMe(true);
 			try {
-				System.out.println("登陆token" + token.hashCode());
 				// 执行登录.
 				currentUser.login(token);
 			}
@@ -45,7 +44,6 @@ public class ShiroHandler {
 			// 所有认证时异常的父类.
 			catch (AuthenticationException ae) {
 				//unexpected condition?  error?
-				System.out.println("登录失败: " + ae.getMessage());
 				return "login";
 			}
 		}

src/main/java/com/xzxtshiro/controller/admin/PermissionNewController.java

@@ -62,9 +62,7 @@ public class PermissionNewController {
     public BaseModel list(SysPermissionNew permission) {
         BaseModel perPage = null;
         SysUser user = TokenUtil.getUser();
-        if ("admin".equals(user.getUsername()) && permission.getId() == null && permission.getPid() == null && permission.getName() == null){
-            perPage = permissionService.selectSysPermissionNewPage(permission);
-        }if(permission.getId() != null || permission.getPid() != null || permission.getName() != null){
+        if ("admin".equals(user.getUsername()) ){
             perPage = permissionService.selectSysPermissionNewPage(permission);
         }else{
             permission.setUserId(user.getId());

src/main/java/com/xzxtshiro/controller/admin/SysRoleController.java

@@ -65,12 +65,9 @@ public class SysRoleController {
     public BaseModel list(SysRole role) {
         //获取当前登录用户
         SysUser dlUser = TokenUtil.getUser();
-        if ("admin".equals(dlUser.getUsername()) && role.getRolename() == null && role.getPermissionName() == null){
+        if ("admin".equals(dlUser.getUsername())){
             return sysRoleService.selectSysRolePage(role);
-        }if(role.getRolename() != null || role.getPermissionName() != null){
-            return sysRoleService.selectSysRolePage(role);
-        }
-        else{
+        }else{
             role.setUserId(dlUser.getId());
             return sysRoleService.selectSysRolePage(role);
         }
@@ -100,7 +97,6 @@ public class SysRoleController {
 
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public String add(SysRole role, Model model) {
-        System.out.println("type.................................="+role.getType());
         SysRole add = sysRoleService.add(role);
         return "redirect:/admin/role/index?msg=success";
     }

src/main/java/com/xzxtshiro/controller/admin/SysUserController.java

@@ -125,17 +125,29 @@ public class SysUserController {
             //grade:X=县级，D=地市级，S=省级，T=特级
             //1.举个栗子，陕西省渭南市用户只能看到渭南市以下的用户
             if (usergrade!=null&&!"".equals(usergrade)){
+                if(dlUser.getUnitcode().contains("S")){
+                    dw = TSsubUnitCode(usergrade, dlUser.getUnitcode(), dw);
+                    user.setCountycode(getDwLike(dlUser.getUnitcode(),0));
+                }else{
                     dw = subUnitCode(usergrade, dlUser.getUnitcode(), dw);
                 }
+
+            }
         }else{
             //unitcode不为空，则根据unitcode+countycode双层查询
             if (usergrade!=null&&!"".equals(usergrade)){
                 dw = subUnitCode(usergrade, dlUser.getUnitcode(), dw);
                 String unitStr = user.getUnitcode();
                 if(dw!=null&&dw.equals(unitStr.substring(0,dw.length()))){
+                    if(dlUser.getUnitcode().contains("S")){
+                        dw = dlUser.getUnitcode().substring(0,2);
+                    }
                     user.setCountycode(getDwLike(user.getUnitcode(),0));
                 }else {
                     user.setCountycode(user.getUnitcode());
+                    if(dlUser.getUnitcode().contains("S")){
+                        dw = dlUser.getUnitcode().substring(0,2);
+                    }
                 }
             }
         }
@@ -159,6 +171,23 @@ public class SysUserController {
         return dw;
     }
 
+    /**
+     * 内蒙森林公安局特殊处理
+     * @param usergrade
+     * @param unitcode
+     * @param dw
+     * @return
+     */
+
+    private static String TSsubUnitCode(String usergrade, String unitcode, String dw) {
+        if(usergrade.equals("S")|| usergrade.equals("T")|| usergrade.equals("D")){
+            dw=unitcode.substring(0, 2);
+        }else{
+            dw=unitcode.substring(0, 10);
+        }
+        return dw;
+    }
+
 
     /**
      * 跳转到用户添加页面
@@ -342,8 +371,6 @@ public class SysUserController {
         String  ids = user.getIds();
         ids = ids.replace(" ","");
         String[] idList = ids.split(",");
-        System.out.println(idList);
-        System.out.println(user.getRoleId());
         for (int i = 0;i<idList.length;i++){
             SysUser thisUser = new SysUser();
             thisUser.setId(idList[i]);
@@ -420,7 +447,6 @@ public class SysUserController {
             //将上传文件保存到一个目标文档中
             File file1 = new File(path + File.separator + filename);
             File newFile = new File(path + File.separator +new Date().getTime()+filename.substring(filename.indexOf(".")));
-            System.out.println("filename=================="+filename);
             file1.renameTo(newFile);
             file.transferTo(newFile);
             res = new HashMap<>();
@@ -446,8 +472,6 @@ public class SysUserController {
             }
             String param="birthday="+birthday+"&sex="+user.getSex()+"&username="+user.getPolicemanid()+"&unitcode="+user.getUnitcode()+"&identitycard="+user.getIdentitycard()+"&telephone="+user.getTelephone()+"&password="+user.getPassword()+"&openFlag="+user.getOpenFlag()+"&policemanid="+user.getPolicemanid()+"&truename="+URLEncoder.encode(user.getTrueName(), "UTF-8");
             String url="http://manage.asj.bt:9017/jwzh-manage/userInfoSync/doSync?"+param;
-            System.out.println("param::::::::::::::::::::"+param);
-            System.out.println("url::::::::::::::::::::"+url);
             URI uri = new URI(url.toString());
             URL url1 = uri.toURL();
             URLConnection connection = url1.openConnection();
@@ -464,7 +488,6 @@ public class SysUserController {
             while ((line = in.readLine()) != null) {
                 jsonStr.append(line);
             }
-            System.out.println("esbServiceReturn.............................:"+jsonStr);
             String esbServiceReturn = jsonStr.toString();
             JSONObject jsonObject= JSONObject.fromObject(esbServiceReturn);
             message=jsonObject.get("message").toString();

src/main/java/com/xzxtshiro/mapper/SysPermissionNewMapper.xml

@@ -54,6 +54,9 @@
           userid=#{userId,jdbcType=VARCHAR}
           and id is not NULL
           and name is not NULL
+    <if test="id != null"> and id = #{id,jdbcType=VARCHAR}</if>
+    <if test="name != null"> and name like '%'||#{name,jdbcType=VARCHAR}||'%'</if>
+    <if test="pid != null"> and pid like '%'||#{pid,jdbcType=VARCHAR}||'%'</if>
     ) t where ROWNUM <![CDATA[<=]]>
     ${limit*page}
     ) where rn > ${(page-1)*limit}
@@ -69,6 +72,9 @@
     userid=#{userId,jdbcType=VARCHAR}
     and id is not NULL
     and name is not NULL
+    <if test="id != null"> and id = #{id,jdbcType=VARCHAR}</if>
+    <if test="name != null"> and name like '%'||#{name,jdbcType=VARCHAR}||'%'</if>
+    <if test="pid != null"> and pid like '%'||#{pid,jdbcType=VARCHAR}||'%'</if>
   </select>
 
   <select id="selectAllPermissions" resultMap="BaseResultMap">
@@ -93,6 +99,9 @@
     FROM
     sys_permission_new
     WHERE scbz='0'
+    <if test="id != null"> and id = #{id,jdbcType=VARCHAR}</if>
+    <if test="name != null"> and name like '%'||#{name,jdbcType=VARCHAR}||'%'</if>
+    <if test="pid != null"> and pid like '%'||#{pid,jdbcType=VARCHAR}||'%'</if>
   </select>
 
   <insert id="insert" parameterType="com.xzxtshiro.pojo.SysPermissionNew" >

src/main/java/com/xzxtshiro/service/imp/ShiroService.java

@@ -10,13 +10,10 @@ public class ShiroService {
 	
 	@RequiresRoles({"admin"})
 	public void testMethod(){
-		System.out.println("testMethod, time: " + new Date());
 
 		Session session = SecurityUtils.getSubject().getSession();
 		Object val = session.getAttribute("key");
 		String JSESSIONID=(String) session.getId();
-		System.out.println("Service SessionVal: " + val);
-		System.out.println("Service JSESSIONID: " + JSESSIONID);
 	}
 	
 }

src/main/java/com/xzxtshiro/service/imp/SysPermissionNewServiceImpl.java

@@ -71,11 +71,7 @@ public class SysPermissionNewServiceImpl implements SysPermissionNewService {
         List<SysPermissionNew> permissions = permissionNewDao.selectSysPermissionNewByCondition(permission);
         Integer count = permissionNewDao.selectSysPermissionNewCountByCondition(permission);
         BaseModel permissionPage = new BaseModel();
-        if(permission.getName() != null || permission.getPid() != null || permission.getId() != null){
-            permissionPage.setCount(permissions.size());
-        }else{
         permissionPage.setCount(count);
-        }
         permissionPage.setData(permissions);
         return permissionPage;
     }
@@ -125,7 +121,6 @@ public class SysPermissionNewServiceImpl implements SysPermissionNewService {
             permission.setMenuname(permission.getName());
             permission.setFlag(1);
             permission.setScbz(0);
-            System.out.println(permission);
             i = permissionNewDao.insert(permission);
             //2.增加权限和角色的关联关系
             if (i>0&&permission.getRoleId()!=null){
@@ -148,8 +143,6 @@ public class SysPermissionNewServiceImpl implements SysPermissionNewService {
         String[] roleList = roleIds.split(",");
         List<SysRolePermission> roleAndPermissions = new ArrayList<SysRolePermission>();
         for (int j=0;j<roleList.length;j++){
-            System.out.println(roleList.length);
-            System.out.println("角色id"+roleList[j]);
             SysRolePermission sysRolePermission = new SysRolePermission();
             sysRolePermission.setId(SequenceUtil.getNextXxzjbh().substring(0,23));
             sysRolePermission.setRoleid(roleList[j]);
@@ -161,7 +154,6 @@ public class SysPermissionNewServiceImpl implements SysPermissionNewService {
             sysRolePermission.setScbz(0);
             roleAndPermissions.add(sysRolePermission);
         }
-        System.out.println(roleAndPermissions.size());
         int k = sysRoleDao.batchAddSysRolePermission(roleAndPermissions);
     }
 

src/main/java/com/xzxtshiro/service/imp/SysRoleServiceImpl.java

@@ -33,6 +33,10 @@ public class SysRoleServiceImpl implements SysRoleService{
     public BaseModel selectSysRolePage(SysRole SysRole) {
         List<SysRole> data = new ArrayList<SysRole>();
 
+        if(SysRole.getRolename() == ""){
+            SysRole.setRolename(null);
+        }
+
         if((SysRole.getPermissionName() != null && SysRole.getRolename() != null) || SysRole.getPermissionName() != null){
             data = sysRoleDao.selectSysRolesAll(SysRole);
 
@@ -66,7 +70,6 @@ public class SysRoleServiceImpl implements SysRoleService{
                     }
 
                     Integer test = role.getPermissionName().indexOf(SysRole.getPermissionName());
-                    System.out.println(test);
 
                     if(role.getPermissionName().indexOf(SysRole.getPermissionName()) != -1){
                     }else{
@@ -121,7 +124,6 @@ public class SysRoleServiceImpl implements SysRoleService{
         Integer count = sysRoleDao.add(sysRole);
         //确保角色保存成功再进行授权
         if (count>0){
-            System.out.println("角色拥有的权限========"+sysRole.getPermissionId());
             if (sysRole.getPermissionId() != null&&!"".equals(sysRole.getPermissionId())) {
                 String[] permissions = sysRole.getPermissionId().split(",");
                 List<SysRolePermission> roleAndPermissions = new ArrayList<SysRolePermission>();

src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java

@@ -107,6 +107,9 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public Integer updateStatusById(SysUser user) {
+        SysUser dlUser = TokenUtil.getUser();
+        user.setGxr(dlUser.getUsername());
+        user.setGxsj(new Date());
         int i = userDao.updateSysUserById(user);
         return i;
     }
@@ -297,8 +300,6 @@ public class SysUserServiceImpl implements SysUserService {
                 sysUserRole.setScbz(0);
                 userRoles.add(sysUserRole);
             }
-            System.out.println("角色信息");
-            System.out.println(userRoles);
             if(userRoles.size()>0){
                 int c = userDao.batchAddSysUserRole(userRoles);
             }
@@ -332,6 +333,8 @@ public class SysUserServiceImpl implements SysUserService {
     @Override
     public Integer deleteUserById(SysUser user) {
         SysUser dlUser = TokenUtil.getUser();
+        user.setGxr(dlUser.getUsername());
+        user.setGxsj(new Date());
         int a = userDao.deleteUserById(user.getId());
         //2.删除用户和角色的绑定关系
         int b = userDao.deleteSysUserRoleByUserId(user.getId());

src/main/java/com/xzxtshiro/shiro/realm/MyRealm.java

@@ -41,7 +41,6 @@ public class MyRealm extends AuthorizingRealm {
     @Override
     protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) {
         logger.info("--- MyRealm doGetAuthorizationInfo ---");
-        System.out.println("--- MyRealm doGetAuthorizationInfo ---");
         // 获得经过认证的主体信息
         SysUser user = (SysUser) principalCollection.getPrimaryPrincipal();
         String userId = user.getId();
@@ -82,10 +81,8 @@ public class MyRealm extends AuthorizingRealm {
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException {
         logger.info("--- MyRealm doGetAuthenticationInfo ---");
-        System.out.println("--- MyRealm doGetAuthenticationInfo ---");
         String username = authenticationToken.getPrincipal().toString();
         String password = new String((char[]) authenticationToken.getCredentials());
-        System.out.println("--- 1111111111111111111Password ---"+password);
         // 以后我们使用 Spring 管理 Shiro 的时候，就不必要这样得到 UserService 了
         // userService = (IUserService) InitServlet.getBean("userService");
         // User user = userService.login(username,password);
@@ -96,14 +93,12 @@ public class MyRealm extends AuthorizingRealm {
         // 再到 subject.login(token) 里面去捕获对应的异常
         // 显示不同的消息到页面上
         SysUser user = userService.login(username, password);
-        System.out.println("user***********************************"+user);
         if (user != null) {
             // 第 1 个参数可以传一个实体对象，然后在认证的环节可以取出
             // 第 2 个参数应该传递在数据库中“正确”的数据，然后和 token 中的数据进行匹配
            // SimpleAuthenticationInfo info = new SimpleAuthenticationInfo(user, user.getPassword(), getName());
             // 设置盐值
            // info.setCredentialsSalt(ByteSource.Util.bytes(username.getBytes()));
-            System.out.println("password+++++++++++++++++++++++++++++=="+user.getPassword());
             String realmName = getName();
             //4). 盐值.
             ByteSource credentialsSalt = ByteSource.Util.bytes(username);

src/main/java/com/xzxtshiro/shiro/realm/ShiroRealm.java

@@ -36,7 +36,6 @@ public class ShiroRealm extends AuthorizingRealm {
 	@Override
 	protected AuthenticationInfo doGetAuthenticationInfo(
 			AuthenticationToken token) throws AuthenticationException {
-		System.out.println("[FirstRealm] doGetAuthenticationInfo");
 
 		//1. 把 AuthenticationToken 转换为 UsernamePasswordToken
 		UsernamePasswordToken upToken = (UsernamePasswordToken) token;
@@ -45,14 +44,12 @@ public class ShiroRealm extends AuthorizingRealm {
 		String username = upToken.getUsername();
 		String password = new String((char[]) upToken.getCredentials());
 		SysUser user = userService.login(username, password);
-		System.out.println("user***********************************"+user);
 		if (user != null) {
 			// 第 1 个参数可以传一个实体对象，然后在认证的环节可以取出
 			// 第 2 个参数应该传递在数据库中“正确”的数据，然后和 token 中的数据进行匹配
 			// SimpleAuthenticationInfo info = new SimpleAuthenticationInfo(user, user.getPassword(), getName());
 			// 设置盐值
 			// info.setCredentialsSalt(ByteSource.Util.bytes(username.getBytes()));
-			System.out.println("password+++++++++++++++++++++++++++++==" + user.getPassword());
 			String realmName = getName();
 			//4). 盐值.
 			ByteSource credentialsSalt = ByteSource.Util.bytes(username);
@@ -68,7 +65,6 @@ public class ShiroRealm extends AuthorizingRealm {
 	protected AuthorizationInfo doGetAuthorizationInfo(
 			PrincipalCollection principals) {
 		logger.info("--- MyRealm doGetAuthorizationInfo ---");
-		System.out.println("--- MyRealm doGetAuthorizationInfo ---");
 		// 获得经过认证的主体信息
 		SysUser user = (SysUser) principals.getPrimaryPrincipal();
 		String userId = user.getId();

src/main/java/com/xzxtshiro/util/HttpClientUtil.java

@@ -150,7 +150,6 @@ public class HttpClientUtil {
 			entity.getContent();
 			//转码
 			String res=EntityUtils.toString(response.getEntity(), HTTP.UTF_8);
-			System.out.println("返回参数==="+res.toString());
 			return res;
 		}
 

src/main/java/com/xzxtshiro/util/MenuUtil.java

@@ -29,9 +29,7 @@ public class MenuUtil {
         List<List<SysPermissionNew>> list = new ArrayList<>();
         SysPermissionNew menu = new SysPermissionNew();
         for (SysPermissionNew resource : resources) {
-            System.out.println(resource.getId()+"======================"+resource.getPid());
             if ("H01".equals(resource.getPid())) {
-                System.out.println(resource.getId()+"高级++++++++++++++++++++"+resource.getPid());
                 menu.setMenuname(resource.getMenuname());
                 menu.setId(resource.getId());
                 menu.setUrl(resource.getUrl());
@@ -39,9 +37,7 @@ public class MenuUtil {
                 menu.setPid(resource.getPid());
                 menu.setType(resource.getType());
                 menu.setChildMenu(getMenus(resource.getId(), resources));
-                System.out.println(resource.getId()+"类型+++++++++++++++++++"+resource.getType());
                 if ("H".equals(menu.getType())) {
-                    System.out.println("进入增加流程");
                     //权限相关菜单
                     adminList.add(menu);
                 } else if ("01".equals(menu.getType())) {
@@ -60,7 +56,6 @@ public class MenuUtil {
     }
 
     public static List<SysPermissionNew> getMenus(String id, List<SysPermissionNew> resources) {
-        System.out.println("进入递归");
         List<SysPermissionNew> lists = new ArrayList<>();
         for (SysPermissionNew resource : resources) {
             SysPermissionNew menu = new SysPermissionNew();

src/main/java/com/xzxtshiro/util/TokenUtil.java

@@ -22,7 +22,6 @@ public class TokenUtil {
     public static SysUser login(SysUser user, boolean rememberMe) {
         Subject subject = SecurityUtils.getSubject();
         UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword());
-        System.out.println("token==================================="+token);
        // token.setRememberMe(true);
         subject.login(token);
         return getUser();

src/main/java/com/xzxtshiro/util/UploadImgUtil.java

@@ -20,7 +20,6 @@ public class UploadImgUtil {
             int length = (int) file.length();
             if (length > Integer.MAX_VALUE) // 当文件的长度超过了int的最大值
             {
-                System.out.println("this file is max ");
                 return null;
             }
             bytes = new byte[length];
@@ -32,7 +31,6 @@ public class UploadImgUtil {
             }
             // 如果得到的字节长度和file实际的长度不一致就可能出错了
             if (offset < bytes.length) {
-                System.out.println("file length is error");
                 return null;
             }
             is.close();

src/main/java/com/xzxtshiro/util/passwordTest.java

@@ -11,6 +11,5 @@ import com.xzxtshiro.pojo.SysUser;
 public class passwordTest {
     public static void main(String[] args){
         Base64PasswordEncrypter base = new Base64PasswordEncrypter();
-        System.out.println(base.encryptPassword("123456"));
     }
 }

src/main/webapp/WEB-INF/jsp/admin/permission/add.jsp

@@ -129,6 +129,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="tree" class="ztree"></ul>
                         </div>
@@ -146,6 +147,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="roleTree" class="ztree"></ul>
                         </div>

src/main/webapp/WEB-INF/jsp/admin/permission/list.jsp

@@ -11,11 +11,6 @@
 
 <body>
 <div class="layui-container">
-    <!--
-        作者：yuton.yao@qq.com
-        时间：2017-09-01
-        描述：引入公共html
-    -->
     <jsp:include page="inc.jsp"></jsp:include>
     <div class="layui-row">
         <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
@@ -33,21 +28,21 @@
             <div class="layui-form-mid">
                 <label class="layui-form-label">权限ID</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="id" id="id" lay-verify="required"
+                    <input type="text" name="perId" id="perId" lay-verify="required"
                            class="layui-input">
                 </div>
             </div>
             <div class="layui-form-mid">
                 <label class="layui-form-label">权限名称</label>
                 <div class="layui-input-block">
-                    <input type="text" name="name" id="name" lay-verify="required"
+                    <input type="text" name="perName" id="perName" lay-verify="required"
                            class="layui-input">
                 </div>
             </div>
             <div class="layui-form-mid">
                 <label class="layui-form-label">父级权限</label>
                 <div class="layui-input-block">
-                    <input type="text" name="pid" id="pid" lay-verify="required"
+                    <input type="text" name="perPid" id="perPid" lay-verify="required"
                            class="layui-input">
                 </div>
             </div>
@@ -156,17 +151,17 @@
     layui.use('table', function(){
         var table = layui.table;
         //方法级渲染
-        table.render({
+        var tableIns = table.render({
             id:"id",
             elem: '#userTable',
-            limit: 50 ,//默认采用10
+            limit: 10 ,//默认采用10
             url: '${pageContext.request.contextPath}/admin/permission/list',
             cols: [[
-                {field:'rn',title:'序号',align:'center', width:60},
-                {field:'id',title:'权限ID', align:'center', width:100, sort: true},
-                {field:'name',title:'权限名称', align:'center',width:150, sort: true},
-                {field:'url',title:'权限URL', align:'center',width:200, sort: true},
-                {field:'pid',title:'父级权限ID', align:'center',width:100, sort: true},
+                {field:'rn',title:'序号',align:'center', width:80},
+                {field:'id',title:'权限ID', align:'center', width:100},
+                {field:'name',title:'权限名称', align:'center',width:150},
+                {field:'url',title:'权限URL', align:'center',width:200},
+                {field:'pid',title:'父级权限ID', align:'center',width:100},
                 {width:200, title:'操作',align:'center', toolbar: '#toolBar'}
             ]],
             id: 'testReload',
@@ -174,14 +169,11 @@
             height: 480
         });
 
-
-        var $ = layui.$, active = {
-            reload: function(){
-                var id = cheNull($('#id').val());
-                var name = cheNull($('#name').val());
-                var pid = cheNull($('#pid').val());
-
-                table.reload('testReload', {
+        $('.queryUserList').on('click', function(){
+            var id = cheNull($('#perId').val());
+            var name = cheNull($('#perName').val());
+            var pid = cheNull($('#perPid').val());
+            tableIns.reload({
                 where: {
                     id: id,
                     name: name,
@@ -191,15 +183,13 @@
                     curr: 1 //重新从第 1 页开始
                 },
                 done: function(res, curr, count){
-                        this.where={};
+                    this.where={
+                        id: id,
+                        name: name,
+                        pid: pid
+                    };
                 }
             });
-            }
-        };
-
-        $('.queryUserList').on('click', function(){
-            var type = $(this).data('type');
-            active[type] ? active[type].call(this) : '';
         });
     });
     function cheNull(str) {

src/main/webapp/WEB-INF/jsp/admin/permission/update.jsp

@@ -139,6 +139,7 @@
                                     <input type="text" autocomplete="off">
                                     <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                     <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                    <span class="layui-btn layui-btn-normal entSelect">确定</span>
                                 </div>
                                 <ul id="tree" class="ztree"></ul>
                             </div>
@@ -156,6 +157,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="roleTree" class="ztree"></ul>
                         </div>

src/main/webapp/WEB-INF/jsp/admin/role/add.jsp

@@ -82,6 +82,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="roleTree" class="ztree"></ul>
                         </div>
@@ -99,6 +100,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="permissionTree" class="ztree"></ul>
                         </div>

src/main/webapp/WEB-INF/jsp/admin/role/list.jsp

@@ -129,16 +129,16 @@
     layui.use('table', function(){
         var table = layui.table;
         //方法级渲染
-        table.render({
+        var tableIns = table.render({
             id:"id",
             elem: '#userTable',
-            limit: 50 ,//默认采用10
+            limit: 10 ,//默认采用10
             url: '${pageContext.request.contextPath}/admin/role/list',
             cols: [[
                 {field:'rn',title:'序号',align:'center', width:100},
-                {field:'id',title:'ID', align:'center', width:200, sort: true},
-                {field:'rolename',title:'角色名称', align:'center',width:400, sort: true},
-                {field:'permissionName',title:'拥有权限', align:'center',width:200, sort: true},
+                {field:'id',title:'ID', align:'center', width:200},
+                {field:'rolename',title:'角色名称', align:'center',width:400},
+                {field:'permissionName',title:'拥有权限', align:'center',width:200},
                 {width:200, title:'操作',align:'center', toolbar: '#toolBar'}
             ]],
             id: 'testReload',
@@ -152,14 +152,7 @@
         $('.queryUserList').on('click', function(){
                 var rolename = cheNull($('#rolename').val());
                 var permissionName = cheNull($('#permissionName').val());
-
-                if (rolename==null){
-                    rolename = '';
-                }
-                if (permissionName==null){
-                    permissionName = '';
-                }
-                table.reload('testReload', {
+            tableIns.reload({
                     where: {
                         rolename: rolename,
                         permissionName: permissionName
@@ -175,11 +168,6 @@
                     }
                 });
         });
-
-        // $('.queryUserList').on('click', function(){
-        //     var type = $(this).data('type');
-        //     active[type] ? active[type].call(this) : '';
-        // });
     });
     function cheNull(str) {
         if (str==""){

src/main/webapp/WEB-INF/jsp/admin/role/update.jsp

@@ -85,6 +85,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="roleTree" class="ztree"></ul>
                         </div>
@@ -102,6 +103,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="permissionTree" class="ztree"></ul>
                         </div>

src/main/webapp/WEB-INF/jsp/admin/user/add.jsp

@@ -141,6 +141,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="unit" class="ztree"></ul>
                         </div>
@@ -159,6 +160,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="roleTree" class="ztree"></ul>
                         </div>

src/main/webapp/WEB-INF/jsp/admin/user/batchUpdate.jsp

@@ -111,6 +111,7 @@
                             <input type="text" autocomplete="off">
                             <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                             <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                            <span class="layui-btn layui-btn-normal entSelect">确定</span>
                         </div>
                         <ul id="unit" class="ztree"></ul>
                     </div>
@@ -129,6 +130,7 @@
                             <input type="text" autocomplete="off">
                             <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                             <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                            <span class="layui-btn layui-btn-normal entSelect">确定</span>
                         </div>
                         <ul id="roleTree" class="ztree"></ul>
                     </div>
@@ -205,6 +207,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="batchRoleTree" class="ztree"></ul>
                         </div>

src/main/webapp/WEB-INF/jsp/admin/user/list.jsp

@@ -95,6 +95,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="unit" class="ztree"></ul>
                         </div>
@@ -112,6 +113,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="roleTree" class="ztree"></ul>
                         </div>
@@ -237,14 +239,14 @@
             limit: 50 ,//默认采用10
             url: '${pageContext.request.contextPath}/admin/user/list',
             cols: [[
-                {field:'rn',title:'序号',align:'center', width:50},
-                {field:'username',title:'登录名',align:'center', width:90, sort: true},
-                {field:'trueName',title:'用户姓名', align:'center',width:100, sort: true},
-                {field:'unitname', title:'所属部门',align:'center',width:260, sort: true},
-                {field:'roleName',title:'用户角色', align:'center',width:250, sort: true},
+                {field:'rn',title:'序号',align:'center', width:72},
+                {field:'username',title:'登录名',align:'center', width:120},
+                {field:'trueName',title:'用户姓名', align:'center',width:120},
+                {field:'unitname', title:'所属部门',align:'center',width:250},
+                {field:'roleName',title:'用户角色', align:'center',width:260},
                 {field: 'id', style:'display:none;'},
-                {field:'openFlag',title:'用户状态',align:'center', width:100, sort: true,templet: '#userStateTpl'},
-                {width:200, title:'操作',align:'center', toolbar: '#toolBar'}
+                {field:'openFlag',title:'用户状态',align:'center', width:100,templet: '#userStateTpl'},
+                {width:180, title:'操作',align:'center', toolbar: '#toolBar'}
             ]],
             id: 'testReload',
             page: true,
@@ -275,8 +277,7 @@
                     curr: 1 //重新从第 1 页开始
                 },
                 done: function(res, curr, count){
-                    console.log("进入2层")
-                    console.log(unitcode+";"+roleName);
+                    $("[data-field='id']").css('display','none');
                     this.where={
                         username: username,
                         trueName: trueName,

src/main/webapp/WEB-INF/jsp/admin/user/update.jsp

@@ -142,6 +142,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="unit" class="ztree"></ul>
                         </div>
@@ -160,6 +161,7 @@
                                 <input type="text" autocomplete="off">
                                 <span class="layui-btn layui-btn-normal inpSearch">搜索</span>
                                 <span class="layui-btn layui-btn-normal clearSer">清空</span>
+                                <span class="layui-btn layui-btn-normal entSelect">确定</span>
                             </div>
                             <ul id="roleTree" class="ztree"></ul>
                         </div>
@@ -267,8 +269,7 @@
 
         //监听提交
         form.on('submit(rulesSubmit)', function (data) {
-
-            layer.confirm('返回用户列表', {icon: 3, title:'提示'}, function(index){
+            layer.confirm('更新成功，返回用户列表！', {icon: 3, title:'提示'}, function(index){
                window.opener=null;
                 window.open('','_self');
                 window.close();

src/main/webapp/resources/common/common.js

@@ -62,6 +62,23 @@ function setTree(data,treeId,type,kid,vid,glcs) {
                     $("#"+vid).val(v);
                    // closeTree();
                 },
+                onClick: function (treeId, treeNode) {
+                    var treeObj = $.fn.zTree.getZTreeObj(treeNode);
+                    var selectedNode = treeObj.getSelectedNodes()[0];
+                    treeObj.checkNode(selectedNode, !selectedNode.checked, true);
+                    var strId = $("#"+kid).val();
+                    var strVal = $("#"+vid).val();
+                    var currId = selectedNode.id+",";
+                    var currVal = selectedNode.name+",";
+                    if(selectedNode.check_Child_State=="-1"&&selectedNode.checked){
+                        $("#"+kid).val(strId+currId);
+                        $("#"+vid).val(strVal+currVal);
+                    }
+                    if(selectedNode.check_Child_State=="-1"&&!selectedNode.checked){
+                        $("#"+kid).val(strId.replace(currId,""));
+                        $("#"+vid).val(strVal.replace(currVal,""));
+                    }
+                }
             }
         };
     }else{
@@ -81,7 +98,7 @@ function setTree(data,treeId,type,kid,vid,glcs) {
                 }
             },
             callback: {
-                onDblClick: function (treeId, treeNode) {
+                onClick: function (treeId, treeNode) {
                     var treeObj = $.fn.zTree.getZTreeObj(treeNode);
                     var selectedNode = treeObj.getSelectedNodes()[0];
                     $("#"+kid).val(selectedNode.id);
@@ -90,8 +107,6 @@ function setTree(data,treeId,type,kid,vid,glcs) {
                         thisName=thisName.substring(0,thisName.indexOf("["));
                     }
                     $("#"+vid).val(thisName);
-                    closeTree();
-                    layer.close(layer.index);
                 },
             }
         };
@@ -108,9 +123,10 @@ function setTree(data,treeId,type,kid,vid,glcs) {
     $(document).ready(function () {
         $.fn.zTree.init($("#"+treeId), setting, data);
         fuzzySearch(treeId,false,true,setting,data,kid,vid); //初始化模糊搜索方法
-
     });
 }
+
+
 function fuzzySearch(zTreeId,isHighLight, isExpand,setting,data,kid,vid){
     var zTreeObj = $.fn.zTree.getZTreeObj(zTreeId);//获取树对象
     if(!zTreeObj){
@@ -213,11 +229,17 @@ function fuzzySearch(zTreeId,isHighLight, isExpand,setting,data,kid,vid){
     $("#"+zTreeId).prev(".ISearch").find(".inpSearch").click(function () {
         ISearch()
     });
+
+    $("#"+zTreeId).prev(".ISearch").find(".entSelect").click(function () {
+        layer.close(layer.index);
+    });
+
     $("#"+zTreeId).prev(".ISearch").find(".clearSer").click(function () {
         $("#"+zTreeId).prev(".ISearch").find("input").val("");
         $.fn.zTree.init($("#"+zTreeId), setting, data);
         $("#"+kid).val("");
         $("#"+vid).val("");
+        zTreeObj.checkAllNodes(false);
     });
     function ISearch() {
         var _keywords = $("#"+zTreeId).prev(".ISearch").find("input").val();
@@ -228,6 +250,8 @@ function fuzzySearch(zTreeId,isHighLight, isExpand,setting,data,kid,vid){
         }
     }
 
+
+
     $("#"+zTreeId).prev(".ISearch").find("input").keydown(function(e) {
         if (e.keyCode == 13) {
             ISearch();
@@ -254,9 +278,10 @@ function fuzzySearch(zTreeId,isHighLight, isExpand,setting,data,kid,vid){
 function checkTree(treeId){
     layer.open({
         type: 1,
-        area:['400px', '430px'],
-        title:'请选择(双击可进行选中)',
-        skin: 'layui-layer-demo', //加上边框
+        area:['447px', '440px'],
+        title:'字典选择',
+        scrolling:'no',
+        skin: 'layui-layer-ztree', //加上边框
         content: $("#"+treeId)
     });
 }

src/main/webapp/resources/ztree/metroStyle/metroStyle.css

@@ -108,14 +108,22 @@ body .line-size{font-size: 20px;  line-height: 32px;}
 .lineheight28{line-height: 28px;}
 body .layui-table-view .layui-table{width:100%;}
 .ISearch{
-    position: fixed;padding: 5px 0;width: 383px;background: #fff;z-index: 100000;
+    position: absolute;margin:0;padding: 5px 0;width: 430px;background: #fff;z-index: 100000;
 }
 .ISearch  input{
     height: 28px;
     margin-left: 9px;
     /* margin-top: 1px; */
-    width: 245px;
+    width: 230px;
     border: 1px solid #ccc;
     border-radius: 5px;
 }
+.ztree{
+    height: 352px;
+    overflow: auto;
+}
+.layui-layer-ztree,.layui-layer-ztree>.layui-layer-content{
+  overflow: hidden!important;
+}
+