用户列表修改

nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_DEPT.wql

@@ -75,3 +75,20 @@
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF
+
+	IF 输入.flag = "2"
+    		PAGEQUERY
+    			SELECT
+                     max(t3.childId)
+                 from
+                 (
+                 select *,
+                 if( find_in_set(t1.pid, @p) > 0,@p := concat(@p,',',id),0 ) as childId
+                 from
+                    (select dept_id as id, pid from sys_dept t order by id) t1,
+                    (select @p := '输入.pid') t2
+                 ) t3
+                 where childId != '0'
+    			ENDSELECT
+    		ENDPAGEQUERY
+    	ENDIF

nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_USER.wql

@@ -14,8 +14,8 @@
 	##			表字段对应输入参数
 	#################################################
 	输入.flag					        TYPEAS s_string
-	输入.deptIds					        TYPEAS s_string
-	输入.deptId					        TYPEAS s_string
+	输入.deptIds					        TYPEAS f_string
+	输入.deptId					        TYPEAS f_string
 	输入.id                              TYPEAS s_string
 	输入.blurry                          TYPEAS s_string
 	输入.is_used                         TYPEAS s_string
@@ -60,7 +60,7 @@
                     sys_user.id = 输入.id
                 ENDOPTION
                 OPTION 输入.deptIds <> ""
-                    sys_user.dept_id in 输入.deptIds
+                    sys_user_dept.dept_id in 输入.deptIds
                 ENDOPTION
                 OPTION 输入.blurry <> ""
                     (email like 输入.blurry or username like 输入.blurry or nickName like 输入.blurry)
@@ -69,7 +69,7 @@
                     sys_user.is_used = 输入.enabled
                 ENDOPTION
                 OPTION 输入.deptId <> ""
-                    sys_user.dept_id = 输入.deptId
+                    sys_user_dept.dept_id = 输入.deptId
                 ENDOPTION
                 OPTION 输入.startTime <> ""
                     sys_user.create_time >= 输入.startTime