用户信息模块

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/entity/HlgUser.java

@@ -53,8 +53,11 @@ public class HlgUser implements Serializable {
 	private String updateBy;
 
 	@TableField(exist = false)
-	private Integer idcardPictureType;  //(1:未上传  2：已上传)
+	private Integer idcardPictureType;  //(1:未上传  2：已上传) 用于查询
 
 	@TableField(exist = false)
 	private Integer subcontractorId;
+
+	@TableField(exist = false)
+	private Integer subcontractType;//(1:未上传  2：已上传)  用于查询
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/mapper/xml/HlgUserMapper.xml

@@ -17,6 +17,7 @@
 
     <sql id="hlgUserJoins">
         left join hlg_platform_subcontractor hps on hps.sys_org_code=a.sys_org_code
+        left join hlg_user_subcontract hus on hus.user_id=a.id
     </sql>
 
 
@@ -53,6 +54,14 @@
 			<if test="hlgUser.subcontractorId != null and hlgUser.subcontractorId != ''">
 				AND hps.subcontractor_id =#{hlgUser.subcontractorId}
 			</if>
+			<if test="hlgUser.subcontractType != null">
+				<if test="hlgUser.subcontractType==1">
+					AND hus.subcontract is null
+				</if>
+				<if test="hlgUser.subcontractType ==2">
+					AND hus.subcontract is not null
+				</if>
+			</if>
         </where>
         ORDER BY a.update_time DESC,id asc
     </select>