暂存

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -1,11 +1,9 @@
 package com.community.huiju.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.base.BaseController;
-import com.community.huiju.model.TaUser;
 import com.community.huiju.service.IUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,7 +14,6 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
-import java.util.HashMap;
 
 /**
  * <p>

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -1,26 +1,15 @@
 package com.community.huiju.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.community.huiju.model.TaUser;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface TaUserMapper {
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(TaUser record);
-
-    int insertSelective(TaUser record);
-
-    TaUser selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(TaUser record);
-
-    int updateByPrimaryKey(TaUser record);
+public interface TaUserMapper extends BaseMapper<TaUser> {
 
     /**
      * 获取已认证通过的
@@ -28,5 +17,5 @@ public interface TaUserMapper {
      * @param page
      * @return
      */
-    List<Map<Object,Object>> selectUserApprove(Map<Object, Object> map, IPage page);
+    public List<Map<String,Object>> selectUserApprove(Map map, IPage page);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/UserMapper.java

@@ -1,12 +1,10 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.model.User;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * 物业web端用户表 Mapper 接口

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaUser.java

@@ -1,240 +1,127 @@
 package com.community.huiju.model;
 
-import java.util.Date;
-
-public class TaUser {
-    private Integer id;
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 住户app端用户表
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_user")
+public class TaUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
     private Integer communityId;
 
+    /**
+     * 楼栋业主资料信息id
+     */
     private Integer buildingOwnerInfoId;
 
+    /**
+     * 头像
+     */
     private String headPortrait;
 
+    /**
+     * 用户姓名
+     */
     private String userName;
 
+    /**
+     * 登录账号就是手机号确保唯一
+     */
     private String loginName;
 
+    /**
+     * 登录密码
+     */
     private String loginPassword;
 
+    /**
+     * 邮箱
+     */
     private String email;
 
+    /**
+     * 性别 1：男   2：女
+     */
     private String gender;
 
+    /**
+     * 1 有效 0 无效(逻辑删除)
+     */
     private String status;
 
+    /**
+     * 备注
+     */
     private String remark;
 
+    /**
+     * 上级目录id存在，表示是这个id下的租客或家属
+     */
     private Integer parentId;
 
+    /**
+     * 接受协议状态  0 是未接受 1是已接受
+     */
     private String acceptAgreementStatus;
 
+    /**
+     * 认证状态  0 是未认证    1是认证通过   2是已作废
+     */
     private String verifyStatus;
 
+    /**
+     * 创建人
+     */
     private Integer createUser;
 
-    private Date createDate;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
 
+    /**
+     * 更新人
+     */
     private Integer updateUser;
 
-    private Date updateDate;
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
 
-    // 海康UserId
+    /**
+     * 海康人员ID
+     */
     private Integer hkUserId;
 
-    // 海康 卡片号
+    /**
+     * 海康 卡片号码
+     */
     private String hkCardNo;
 
-    // 人脸状态
+    /**
+     * 人脸状态  0 是未上传   1是已上传   register/unregister
+     */
     private String faceStatus;
 
-    // 角色编号
-    private Integer role;
-
-    // 角色名称
-    private String roleName;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getCommunityId() {
-        return communityId;
-    }
-
-    public void setCommunityId(Integer communityId) {
-        this.communityId = communityId;
-    }
-
-    public Integer getBuildingOwnerInfoId() {
-        return buildingOwnerInfoId;
-    }
-
-    public void setBuildingOwnerInfoId(Integer buildingOwnerInfoId) {
-        this.buildingOwnerInfoId = buildingOwnerInfoId;
-    }
-
-    public String getHeadPortrait() {
-        return headPortrait;
-    }
-
-    public void setHeadPortrait(String headPortrait) {
-        this.headPortrait = headPortrait == null ? null : headPortrait.trim();
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName == null ? null : userName.trim();
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName == null ? null : loginName.trim();
-    }
-
-    public String getLoginPassword() {
-        return loginPassword;
-    }
-
-    public void setLoginPassword(String loginPassword) {
-        this.loginPassword = loginPassword == null ? null : loginPassword.trim();
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email == null ? null : email.trim();
-    }
-
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender == null ? null : gender.trim();
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status == null ? null : status.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public Integer getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Integer parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getAcceptAgreementStatus() {
-        return acceptAgreementStatus;
-    }
-
-    public void setAcceptAgreementStatus(String acceptAgreementStatus) {
-        this.acceptAgreementStatus = acceptAgreementStatus == null ? null : acceptAgreementStatus.trim();
-    }
-
-    public String getVerifyStatus() {
-        return verifyStatus;
-    }
-
-    public void setVerifyStatus(String verifyStatus) {
-        this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
-    }
-
-    public String getFaceStatus() {
-        return faceStatus;
-    }
-
-    public void setFaceStatus(String faceStatus) {
-        this.faceStatus = faceStatus;
-    }
-
-    public Integer getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(Integer createUser) {
-        this.createUser = createUser;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Integer getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(Integer updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public Integer getHkUserId() {
-        return hkUserId;
-    }
-
-    public void setHkUserId(Integer hkUserId) {
-        this.hkUserId = hkUserId;
-    }
-
-    public String getHkCardNo() {
-        return hkCardNo;
-    }
-
-    public void setHkCardNo(String hkCardNo) {
-        this.hkCardNo = hkCardNo;
-    }
-
-    public Integer getRole() {
-        return role;
-    }
-
-    public void setRole(Integer role) {
-        this.role = role;
-    }
-
-    public String getRoleName() {
-        return roleName;
-    }
 
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
-}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/User.java

@@ -87,10 +87,5 @@ public class User implements Serializable {
      */
     private LocalDateTime updateDate;
 
-    /** 用户token **/
-    private String token;
-
-    /** 角色 **/
-    private List<SysRole> roles;
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IUserService.java

@@ -1,13 +1,9 @@
 package com.community.huiju.service;
 
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TaUser;
-import com.community.huiju.model.User;
-
-import java.util.Map;
 
 /**
  * <p>
@@ -17,7 +13,13 @@ import java.util.Map;
  * @author jobob
  * @since 2018-12-18
  */
-public interface IUserService extends IService<User> {
+public interface IUserService extends IService<TaUser> {
+
+    /**
+     * 分页查询已认证通过的业主
+     * @param paramets
+     * @return
+     */
     ResponseBean selectUserApprove(String paramets);
 
     /**

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java

@@ -7,16 +7,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.UserMapper;
-import com.community.huiju.model.TaUser;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.dao.SysRoleMapper;
 import com.community.huiju.dao.UserCommunityMapper;
-import com.community.huiju.dao.UserMapper;
 import com.community.huiju.model.SysRole;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.model.User;
 import com.community.huiju.model.UserCommunity;
 import com.community.huiju.service.IUserService;
@@ -63,18 +60,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         JSONObject jsonobject = JSONObject.parseObject(paramets);
         Integer pageNum = jsonobject.getInteger("pageNum");
         Integer pageSize = jsonobject.getInteger("pageSize");
-        TaUser tpTicket = JSONObject.parseObject(paramets, TaUser.class);
-        HashMap map = new HashMap<>();
-        map.put("loginName", tpTicket.getLoginName());
-        map.put("userName", tpTicket.getUserName());
-        map.put("verifyStatus", tpTicket.getVerifyStatus());
+        TaUser taUser = JSONObject.parseObject(paramets, TaUser.class);
+        Map<String, Object> map = new HashMap<>();
+        map.put("loginName", taUser.getLoginName());
+        map.put("userName", taUser.getUserName());
+        map.put("verifyStatus", taUser.getVerifyStatus());
 
         // 分页
         Page<TaUser> page = new Page<>();
-        page.setSize(pageSize == null ? 1 : pageSize);
-        page.setCurrent(pageNum == null ? 10 : pageNum);
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        List<Map<Object, Object>> mapList = taUserMapper.selectUserApprove(map, page);
+        List<Map<String, Object>> mapList = taUserMapper.selectUserApprove(map, page);
         responseBean.addSuccess(mapList);
 
         return responseBean;
@@ -104,7 +101,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         // 查询用户
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("login_name", phone);
-        User user = userMapper.selectOne(queryWrapper);
+        User user = userMapper.selectOne(queryWrapper) ;
         if (null == user) {
             responseBean.addError("当前手机号不存在, 请联系运营人员!");
             return responseBean;

CODE/smart-community/property-api/src/main/resources/mapper/TaUserMapper.xml

@@ -1,286 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.community.huiju.dao.TaUserMapper" >
-  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaUser" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="community_id" property="communityId" jdbcType="INTEGER" />
-    <result column="building_owner_info_id" property="buildingOwnerInfoId" jdbcType="INTEGER" />
-    <result column="head_portrait" property="headPortrait" jdbcType="VARCHAR" />
-    <result column="user_name" property="userName" jdbcType="VARCHAR" />
-    <result column="login_name" property="loginName" jdbcType="VARCHAR" />
-    <result column="login_password" property="loginPassword" jdbcType="VARCHAR" />
-    <result column="email" property="email" jdbcType="VARCHAR" />
-    <result column="gender" property="gender" jdbcType="CHAR" />
-    <result column="status" property="status" jdbcType="CHAR" />
-    <result column="remark" property="remark" jdbcType="VARCHAR" />
-    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
-    <result column="accept_agreement_status" property="acceptAgreementStatus" jdbcType="CHAR" />
-    <result column="verify_status" property="verifyStatus" jdbcType="CHAR" />
-    <result column="create_user" property="createUser" jdbcType="INTEGER" />
-    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
-    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
-    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
-    <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
-    <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
-    <result column="face_status" property="faceStatus" jdbcType="CHAR" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password,
-    email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
-    create_user, create_date, update_user, update_date, hk_user_id, hk_card_no, face_status
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select
-    <include refid="Base_Column_List" />
-    from ta_user
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from ta_user
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
-    insert into ta_user (id, community_id, building_owner_info_id,
-      head_portrait, user_name, login_name,
-      login_password, email, gender,
-      status, remark, parent_id,
-      accept_agreement_status, verify_status, create_user,
-      create_date, update_user, update_date,
-      hk_user_id, hk_card_no, face_status
-      )
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
-      #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
-      #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR},
-      #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
-      #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
-      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
-    insert into ta_user
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        id,
-      </if>
-      <if test="communityId != null" >
-        community_id,
-      </if>
-      <if test="buildingOwnerInfoId != null" >
-        building_owner_info_id,
-      </if>
-      <if test="headPortrait != null" >
-        head_portrait,
-      </if>
-      <if test="userName != null" >
-        user_name,
-      </if>
-      <if test="loginName != null" >
-        login_name,
-      </if>
-      <if test="loginPassword != null" >
-        login_password,
-      </if>
-      <if test="email != null" >
-        email,
-      </if>
-      <if test="gender != null" >
-        gender,
-      </if>
-      <if test="status != null" >
-        status,
-      </if>
-      <if test="remark != null" >
-        remark,
-      </if>
-      <if test="parentId != null" >
-        parent_id,
-      </if>
-      <if test="acceptAgreementStatus != null" >
-        accept_agreement_status,
-      </if>
-      <if test="verifyStatus != null" >
-        verify_status,
-      </if>
-      <if test="createUser != null" >
-        create_user,
-      </if>
-      <if test="createDate != null" >
-        create_date,
-      </if>
-      <if test="updateUser != null" >
-        update_user,
-      </if>
-      <if test="updateDate != null" >
-        update_date,
-      </if>
-      <if test="hkUserId != null" >
-        hk_user_id,
-      </if>
-      <if test="hkCardNo != null" >
-        hk_card_no,
-      </if>
-      <if test="faceStatus != null" >
-        face_status,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="communityId != null" >
-        #{communityId,jdbcType=INTEGER},
-      </if>
-      <if test="buildingOwnerInfoId != null" >
-        #{buildingOwnerInfoId,jdbcType=INTEGER},
-      </if>
-      <if test="headPortrait != null" >
-        #{headPortrait,jdbcType=VARCHAR},
-      </if>
-      <if test="userName != null" >
-        #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="loginName != null" >
-        #{loginName,jdbcType=VARCHAR},
-      </if>
-      <if test="loginPassword != null" >
-        #{loginPassword,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null" >
-        #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="gender != null" >
-        #{gender,jdbcType=CHAR},
-      </if>
-      <if test="status != null" >
-        #{status,jdbcType=CHAR},
-      </if>
-      <if test="remark != null" >
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="parentId != null" >
-        #{parentId,jdbcType=INTEGER},
-      </if>
-      <if test="acceptAgreementStatus != null" >
-        #{acceptAgreementStatus,jdbcType=CHAR},
-      </if>
-      <if test="verifyStatus != null" >
-        #{verifyStatus,jdbcType=CHAR},
-      </if>
-      <if test="createUser != null" >
-        #{createUser,jdbcType=INTEGER},
-      </if>
-      <if test="createDate != null" >
-        #{createDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUser != null" >
-        #{updateUser,jdbcType=INTEGER},
-      </if>
-      <if test="updateDate != null" >
-        #{updateDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="hkUserId != null" >
-        #{hkUserId,jdbcType=INTEGER},
-      </if>
-      <if test="hkCardNo != null" >
-        #{hkCardNo,jdbcType=VARCHAR},
-      </if>
-      <if test="faceStatus != null" >
-        #{faceStatus,jdbcType=CHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
-    update ta_user
-    <set >
-      <if test="communityId != null" >
-        community_id = #{communityId,jdbcType=INTEGER},
-      </if>
-      <if test="buildingOwnerInfoId != null" >
-        building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER},
-      </if>
-      <if test="headPortrait != null" >
-        head_portrait = #{headPortrait,jdbcType=VARCHAR},
-      </if>
-      <if test="userName != null" >
-        user_name = #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="loginName != null" >
-        login_name = #{loginName,jdbcType=VARCHAR},
-      </if>
-      <if test="loginPassword != null" >
-        login_password = #{loginPassword,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null" >
-        email = #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="gender != null" >
-        gender = #{gender,jdbcType=CHAR},
-      </if>
-      <if test="status != null" >
-        status = #{status,jdbcType=CHAR},
-      </if>
-      <if test="remark != null" >
-        remark = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="parentId != null" >
-        parent_id = #{parentId,jdbcType=INTEGER},
-      </if>
-      <if test="acceptAgreementStatus != null" >
-        accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
-      </if>
-      <if test="verifyStatus != null" >
-        verify_status = #{verifyStatus,jdbcType=CHAR},
-      </if>
-      <if test="createUser != null" >
-        create_user = #{createUser,jdbcType=INTEGER},
-      </if>
-      <if test="createDate != null" >
-        create_date = #{createDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUser != null" >
-        update_user = #{updateUser,jdbcType=INTEGER},
-      </if>
-      <if test="updateDate != null" >
-        update_date = #{updateDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="hkUserId != null" >
-        hk_user_id = #{hkUserId,jdbcType=INTEGER},
-      </if>
-      <if test="hkCardNo != null" >
-        hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
-      </if>
-      <if test="faceStatus != null" >
-        face_status = #{faceStatus,jdbcType=CHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaUser" >
-    update ta_user
-    set community_id = #{communityId,jdbcType=INTEGER},
-      building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER},
-      head_portrait = #{headPortrait,jdbcType=VARCHAR},
-      user_name = #{userName,jdbcType=VARCHAR},
-      login_name = #{loginName,jdbcType=VARCHAR},
-      login_password = #{loginPassword,jdbcType=VARCHAR},
-      email = #{email,jdbcType=VARCHAR},
-      gender = #{gender,jdbcType=CHAR},
-      status = #{status,jdbcType=CHAR},
-      remark = #{remark,jdbcType=VARCHAR},
-      parent_id = #{parentId,jdbcType=INTEGER},
-      accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
-      verify_status = #{verifyStatus,jdbcType=CHAR},
-      create_user = #{createUser,jdbcType=INTEGER},
-      create_date = #{createDate,jdbcType=TIMESTAMP},
-      update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP},
-      hk_user_id = #{hkUserId,jdbcType=INTEGER},
-      hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
-      face_status = #{faceStatus,jdbcType=CHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <select id="selectUserApprove" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TaUser">
+  <select id="selectUserApprove" parameterType="map" resultType="map" >
     SELECT
     t.user_name,
     t.login_name ,
@@ -295,7 +16,17 @@
     ta_user t
     LEFT JOIN tp_building_owner_info boi ON t.building_owner_info_id = boi.id
     LEFT JOIN ta_sys_user_role sur ON t.id=sur.user_id
-    WHERE
-    andsur.role_id=1 and t.status=1 and t.verify_status=1
+    <where>
+    <if test="userName != null and userName != ''" >
+      AND user_name = #{userName,jdbcType=VARCHAR}
+    </if>
+    <if test="loginName != null and loginName != ''" >
+      AND  login_name = #{loginName,jdbcType=VARCHAR}
+    </if>
+    <if test="verifyStatus != null and verifyStatus != ''" >
+      AND verify_status = #{verifyStatus,jdbcType=CHAR}
+    </if>
+      AND sur.role_id=1 and t.status=1 and t.verify_status=1
+    </where>
   </select>
 </mapper>