用户信息模块

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

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -50,4 +51,10 @@ public class HlgUser implements Serializable {
 	private Date updateTime;
 	/**更新者*/
 	private String updateBy;
+
+	@TableField(exist = false)
+	private Integer idcardPictureType;  //(1:未上传  2：已上传)
+
+	@TableField(exist = false)
+	private Integer subcontractorId;
 }

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

@@ -16,7 +16,7 @@
 	</sql>
 
     <sql id="hlgUserJoins">
-
+        left join hlg_platform_subcontractor hps on hps.sys_org_code=a.sys_org_code
     </sql>
 
 
@@ -42,9 +42,17 @@
             <if test="hlgUser.idcardNumber != null and hlgUser.idcardNumber != ''">
                 AND a.idcard_number LIKE concat('%',#{hlgUser.idcardNumber},'%')
             </if>
-            <if test="hlgUser.idcardPicture != null and hlgUser.idcardPicture != ''">
-                AND a.idcard_picture = #{hlgUser.idcardPicture}
+            <if test="hlgUser.idcardPictureType != null">
+			     <if test="hlgUser.idcardPictureType==1">
+                    AND a.idcard_picture is null
+				 </if>
+				<if test="hlgUser.idcardPictureType ==2">
+					AND a.idcard_picture is not null
+				</if>
             </if>
+			<if test="hlgUser.subcontractorId != null and hlgUser.subcontractorId != ''">
+				AND hps.subcontractor_id =#{hlgUser.subcontractorId}
+			</if>
         </where>
         ORDER BY a.update_time DESC,id asc
     </select>