增加组织的过滤

src/main/java/net/wicp/tams/duckula/ops/pages/cas/UserManager.java

 package net.wicp.tams.duckula.ops.pages.cas;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.SetupRender;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.util.TextStreamResponse;
 
@@ -10,13 +16,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import cn.hutool.crypto.digest.BCrypt;
+import net.wicp.tams.app.duckula.controller.bean.models.SysOrg;
 import net.wicp.tams.app.duckula.controller.bean.models.SysUser;
 import net.wicp.tams.app.duckula.controller.dao.SysUserMapper;
+import net.wicp.tams.app.duckula.controller.service.cas.impl.OrgService;
 import net.wicp.tams.cas.constant.ColsSysOrg;
 import net.wicp.tams.common.Result;
 import net.wicp.tams.common.apiext.CollectionUtil;
 import net.wicp.tams.common.apiext.PwdUtil;
 import net.wicp.tams.common.apiext.StringUtil;
+import net.wicp.tams.common.apiext.json.EasyUiAssist;
 import net.wicp.tams.common.callback.IConvertValue;
 import net.wicp.tams.common.callback.impl.convertvalue.ConvertValueEnum;
 import net.wicp.tams.common.constant.dic.Gender;
@@ -29,6 +38,36 @@ public class UserManager extends ParentPageBean<SysUser> {
 
 	@Inject
 	private SysUserMapper sysUserMapper;
+	
+	
+	
+	@SuppressWarnings("rawtypes")
+	public TextStreamResponse onQuery() {
+		org.apache.tapestry5.json.JSONObject params = TapestryAssist.packParams(request, true);
+		String userName = params.getString("userName");
+		org.apache.tapestry5.json.JSONArray orgIds = TapestryAssist.getParams(params, "orgId");
+		QueryWrapper<SysUser> queryWrapper = new QueryWrapper<SysUser>();
+		if (StringUtils.isNotBlank(userName)) {
+			queryWrapper.likeLeft("user_name", userName);
+		}
+		if (orgIds != null && orgIds.size() > 0) {
+			List<Long> orglist = new ArrayList<Long>();
+			for (int i = 0; i < orgIds.size(); i++) {
+				orglist.add(Long.parseLong(orgIds.getString(i)));
+			}
+			queryWrapper.in("org_id", orglist);
+		}
+		List<SysUser> users = this.sysUserMapper.selectList(queryWrapper);
+		ConvertValueMysql orgconv = new ConvertValueMysql(ColsSysOrg.db, ColsSysOrg.tb, "org_name");
+		Map<String, IConvertValue> map = new HashMap<String, IConvertValue>();
+		map.put("orgId1", orgconv);
+		map.put("status1", new ConvertValueEnum(YesOrNo.class));
+		map.put("gender1", new ConvertValueEnum(Gender.class));
+		String str = EasyUiAssist.getJsonForGridAlias2(users, new String[] {  "orgId,orgId1", "status,status1", "gender,gender1" }, map, users.size());
+		return retStream(str);
+	}
+	
+	
 
 	@Override
 	public void packageQuery(SysUser t, QueryWrapper<SysUser> queryWrapper) {
@@ -37,6 +76,7 @@ public class UserManager extends ParentPageBean<SysUser> {
 		}
 
 	}
+
 	@Override
 	protected Pair<String[], Map<String, IConvertValue>> packageConvert() {
 		ConvertValueMysql orgCv = new ConvertValueMysql(ColsSysOrg.db, ColsSysOrg.tb, "org_name");
@@ -102,6 +142,30 @@ public class UserManager extends ParentPageBean<SysUser> {
 		return this.sysUserMapper;
 	}
 
+	@Property
+	private String orgTree;
 
+	@Property
+	private String orgId;
+
+	@Inject
+	private OrgService orgService;
+
+	@SetupRender
+	void init() {
+		orgTree = orgService.createOrgTree(new IConvertValue<Object>() {
+			@Override
+			public String getStr(Object obj) {
+				SysOrg org = (SysOrg) obj;
+				String key = org.getOrgName();
+				if (StringUtil.isNull(key) || !messages.contains(key)) {
+					return key;
+				}
+				return messages.get(key);
+			}
+		});
+		orgId = request.getParameter("orgId");
+		System.out.println("orgId=" + orgId);
+	}
 
 }

src/main/resources/net/wicp/tams/duckula/ops/pages/cas/UserManager.tml

@@ -17,7 +17,11 @@
 				<td>
 				   <r:validatebox name="userName"/>
 				</td>
-				<td class="frame_table_list_4_righttext" colspan="6">
+				<td class="frame_table_list_4_righttext">组织</td>
+			 	<td>
+			 	   <input class="easyui-combotree" id="orgIdQuery" name="orgId" multiple="true" data-options="data:${orgTree},method:'get',editable:false,cascadeCheck:'checked'" style="width:200px;"/>
+			 	</td>
+				<td class="frame_table_list_4_righttext" colspan="4">
 				  <font color="red">
 				   <div align="left"> </div>
 				   </font>
@@ -51,7 +55,7 @@
 			       <tr>
 			         <td class="frame_table_list_2_righttext">组织</td>
 			 	     <td>
-			 	        <c:combotreegridorg id="orgId_save" name="orgId"  multiple="false" orgId="1"></c:combotreegridorg>
+			 	        <input class="easyui-combotree" id="orgId" name="orgId" data-options="data:${orgTree},method:'get',required:true" style="width:200px;"/>
 			 	     </td>
 			         <td class="frame_table_list_2_righttext">是否可用</td>
 			         <td>
@@ -104,7 +108,9 @@
      }
 
    function initAdd(){
-      //$('#os_save').combobox('setValue','Linux');
+      if(orgId!=''){
+         $('#orgId').combotree('setValue', orgId);
+     }
    }
    function initUpdate(){
       //$('#ip2').textbox('readonly',true);
@@ -175,10 +181,20 @@
      	 return rows[index];
    }
    
+  var orgId = '${orgId}';
   $(function(){
       $('#savePwd').bind('click', savePwd);
+      //组织
+      if(orgId!=''){
+         $('#orgIdQuery').combotree('setValue', orgId);
+         $('#orgIdQuery').combotree('readonly', true);
+         $('#orgId').combotree('setValue', orgId);
+         $('#orgId').combotree('readonly', true);
+      }
    });
    
+  
+   
     
 </script>
 </body>