修改获find_user_page

controllers/partial/SystemController.go

@@ -131,7 +131,7 @@ func System_FindUserPage(c *entitys.CtrlContext) {
 	result, err := sysutils.PageSearch(c.Db, "system", "find_user_page", "sys_user", paramMap_i_t)
 
 	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), ""})
 		return
 	}
 

light-apiengine.xml

@@ -614,6 +614,8 @@
             </api>
             <api name="tag_page" desc="获取标签分页数" function="page" table="sys_tag" method="get,post" >
             </api>
+            <api name="user_tag_page" desc="分页获取用户标签" function="page" table="sys_user_tag" method="get,post" >
+            </api>
             <api name="add_tag" desc="添加标签" method="post,get,put">
                 <param name="name" type="string" desc="分组名称"/>
                 <param name="group_id" type="string" desc="分组ID"/>
@@ -644,6 +646,21 @@
                     <failure ref="$sys_return"></failure>
                 </return>
             </api>
+            <api name="add_user_tag" desc="添加用户标签" method="post,get,put">
+                <param name="user_id" type="string" desc="用户ID"/>
+                <param name="tag_id" type="string" desc="标签ID"/>
+                <return>
+                    <success ref="$sys_return"></success>
+                    <failure ref="$sys_return"></failure>
+                </return>
+            </api>
+            <api name="del_user_tag" desc="删除标签" method="post,get,put">
+                <param name="id" type="string" desc="标签ID"/>
+                <return>
+                    <success ref="$sys_return"></success>
+                    <failure ref="$sys_return"></failure>
+                </return>
+            </api>
         </controller>
         <controller name="api" desc="api接口">
             <api name="api_doc" method="get" desc="api文档">
@@ -1220,5 +1237,19 @@
             <column isNull="false" name="last_update_time" caption="最后更新时间" type="int64" />
             <column isNull="false" name="del_flag" caption="是否删除 1：删除   0：正常" type="int32"/>
         </table>
+        <table name="sys_user_tag" desc="用户标签表">
+            <column isNull="false" isPK="true" name="id" caption="主键" dbtype="varchar(36)"
+                    type="string" size="36">
+                <auto value="$uuid" update="false">
+                </auto>
+            </column>
+            <column isNull="false" name="tag_id" caption="标签ID" type="string" size="36" dbtype="varchar(36)"/>
+            <column isNull="false" name="user_id" caption="用户ID" type="string" size="36" dbtype="varchar(36)"/>
+            <column isNull="false" name="create_by" caption="创建人" type="string" size="36" dbtype="varchar(36)"/>
+            <column isNull="false" name="create_time" caption="创建时间" type="local_time" />
+            <column isNull="false" name="last_update_by" caption="最后更新人" type="string" size="36" dbtype="varchar(36)"/>
+            <column isNull="false" name="last_update_time" caption="最后更新时间" type="int64" />
+            <column isNull="false" name="del_flag" caption="是否删除 1：删除   0：正常" type="int32"/>
+        </table>
     </tables>
 </application>

sqlconfig/system_controller/system_find_user_page_count.tpl

@@ -3,7 +3,7 @@ select
     count(*) records
 from
     sys_user
-{{if ne .cn_org_id ""}}
+{{if or (ne .cn_org_id "") (ne .org_id "")}}
 left join
     sys_org
 on