Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserPermissionDto.java

@@ -92,4 +92,24 @@ public class UserPermissionDto {
 
     @JsonIgnore
     private String cityCode;
+
+    /**
+     * 管辖机构名称
+     */
+    private String superviseOrgName;
+
+    /**
+     * 管辖机构code
+     */
+    private String superviseOrgCode;
+
+    /**
+     * 使用单位统一信用代码
+     */
+    private String useCode;
+
+    /**
+     * 人员类型code
+     */
+    private String postCode;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -304,7 +304,9 @@
         u.sequence_nbr as uid,
         u.sequence_nbr as "rowId",
         concat(e.city, e.district) as fullAddress,
-        u.rec_date
+        u.rec_date,
+        e.supervise_org_name as superviseOrgName,
+        e.use_code as useCode
         FROM
         "tzs_user_info" u
         left join tzs_user_permission p on u.sequence_nbr = p.user_seq
@@ -320,6 +322,12 @@
                     u.new_post like concat('%',#{post}, '%')
                 </foreach>
             </if>
+            <if test="filter.postCode != null and filter.postCode != ''">
+                and u.new_post like concat('%',#{filter.postCode}, '%')
+            </if>
+            <if test="filter.superviseOrgCode != null and filter.superviseOrgCode != ''">
+                and e.supervise_org_code like concat('%',#{filter.superviseOrgCode}, '%')
+            </if>
         </where>) as a
         <where>
             <if test="filter.useUnit != null and filter.useUnit != ''">