增加筛选项

src/main/java/com/caimei365/manager/controller/caimei/user/ZylTicketApi.java

@@ -19,9 +19,10 @@ public class ZylTicketApi {
     private ZylService zylService;
 
     @GetMapping("/ticket/list")
-    public ResponseJson<PaginationVo<ZylTicket>> getTicketList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+    public ResponseJson<PaginationVo<ZylTicket>> getTicketList(String mobile,
+                                                               @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
-        return zylService.getTicketList(pageNum, pageSize);
+        return zylService.getTicketList(mobile,pageNum, pageSize);
     }
 
     @GetMapping("/ticket/detail")

src/main/java/com/caimei365/manager/dao/user/UserMapper.java

@@ -90,7 +90,7 @@ public interface UserMapper
      */
     int delUser(User user);
 
-    List<ZylTicket> findTicketList();
+    List<ZylTicket> findTicketList(String mobile);
 
     List<ZylShop> findShops();
 

src/main/java/com/caimei365/manager/service/caimei/user/ZylService.java

@@ -11,7 +11,7 @@ import java.util.List;
 public interface ZylService {
 
 
-    ResponseJson<PaginationVo<ZylTicket>> getTicketList(int pageNum, int pageSize);
+    ResponseJson<PaginationVo<ZylTicket>> getTicketList(String mobile, int pageNum, int pageSize);
 
     ResponseJson<List<ZylTicketDetail>> getTicketDetail(Integer userId);
 

src/main/java/com/caimei365/manager/service/caimei/user/impl/ZylTicketImpl.java

@@ -23,9 +23,9 @@ public class ZylTicketImpl implements ZylService {
 
 
     @Override
-    public ResponseJson<PaginationVo<ZylTicket>> getTicketList(int pageNum, int pageSize) {
+    public ResponseJson<PaginationVo<ZylTicket>> getTicketList(String mobile, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<ZylTicket> ticketList = userMapper.findTicketList();
+        List<ZylTicket> ticketList = userMapper.findTicketList(mobile);
         PaginationVo<ZylTicket> pageList = new PaginationVo<>(ticketList);
         return ResponseJson.success(pageList);
     }

src/main/resources/mapper/user/UserMapper.xml

@@ -5,148 +5,149 @@
 <mapper namespace="com.caimei365.manager.dao.user.UserMapper">
 
     <resultMap type="User" id="UserResult">
-        <result property="userID"    column="userID"    />
-        <result property="userOrganizeID"    column="userOrganizeID"    />
-        <result property="account"    column="account"    />
-        <result property="mobile"    column="mobile"    />
-        <result property="bindMobile"    column="bindMobile"    />
-        <result property="userPermission"    column="userPermission"    />
-        <result property="userIdentity"    column="userIdentity"    />
-        <result property="email"    column="email"    />
-        <result property="userName"    column="userName"    />
-        <result property="realName"    column="realName"    />
-        <result property="source"    column="source"    />
-        <result property="image"    column="image"    />
-        <result property="password"    column="password"    />
-        <result property="name"    column="name"    />
-        <result property="registerUserTypeID"    column="registerUserTypeID"    />
-        <result property="manufacturerStatus"    column="manufacturerStatus"    />
-        <result property="shopID"    column="shopID"    />
-        <result property="auditStatus"    column="auditStatus"    />
-        <result property="auditTime"    column="auditTime"    />
-        <result property="auditNote"    column="auditNote"    />
-        <result property="registerTime"    column="registerTime"    />
-        <result property="registerIP"    column="registerIP"    />
-        <result property="ipAddress"    column="ipAddress"    />
-        <result property="loginTime"    column="loginTime"    />
-        <result property="loginIP"    column="loginIP"    />
-        <result property="validFlag"    column="validFlag"    />
-        <result property="clubStatus"    column="clubStatus"    />
-        <result property="clubID"    column="clubID"    />
-        <result property="agreeFlag"    column="agreeFlag"    />
-        <result property="serviceProviderStatus"    column="serviceProviderStatus"    />
-        <result property="serviceProviderID"    column="serviceProviderID"    />
-        <result property="userMoney"    column="userMoney"    />
-        <result property="ableUserMoney"    column="ableUserMoney"    />
-        <result property="logoffTime"    column="logoffTime"    />
-        <result property="appKey"    column="appKey"    />
-        <result property="appSecret"    column="appSecret"    />
-        <result property="scanFlag"    column="scanFlag"    />
-        <result property="userBeans"    column="userBeans"    />
-        <result property="guideFlag"    column="guideFlag"    />
-        <result property="loginFailTime"    column="loginFailTime"    />
-        <result property="tipStatus"    column="tipStatus"    />
-        <result property="onlineMoney"    column="onlineMoney"    />
-        <result property="unionId"    column="unionId"    />
-        <result property="openId"    column="openId"    />
+        <result property="userID" column="userID"/>
+        <result property="userOrganizeID" column="userOrganizeID"/>
+        <result property="account" column="account"/>
+        <result property="mobile" column="mobile"/>
+        <result property="bindMobile" column="bindMobile"/>
+        <result property="userPermission" column="userPermission"/>
+        <result property="userIdentity" column="userIdentity"/>
+        <result property="email" column="email"/>
+        <result property="userName" column="userName"/>
+        <result property="realName" column="realName"/>
+        <result property="source" column="source"/>
+        <result property="image" column="image"/>
+        <result property="password" column="password"/>
+        <result property="name" column="name"/>
+        <result property="registerUserTypeID" column="registerUserTypeID"/>
+        <result property="manufacturerStatus" column="manufacturerStatus"/>
+        <result property="shopID" column="shopID"/>
+        <result property="auditStatus" column="auditStatus"/>
+        <result property="auditTime" column="auditTime"/>
+        <result property="auditNote" column="auditNote"/>
+        <result property="registerTime" column="registerTime"/>
+        <result property="registerIP" column="registerIP"/>
+        <result property="ipAddress" column="ipAddress"/>
+        <result property="loginTime" column="loginTime"/>
+        <result property="loginIP" column="loginIP"/>
+        <result property="validFlag" column="validFlag"/>
+        <result property="clubStatus" column="clubStatus"/>
+        <result property="clubID" column="clubID"/>
+        <result property="agreeFlag" column="agreeFlag"/>
+        <result property="serviceProviderStatus" column="serviceProviderStatus"/>
+        <result property="serviceProviderID" column="serviceProviderID"/>
+        <result property="userMoney" column="userMoney"/>
+        <result property="ableUserMoney" column="ableUserMoney"/>
+        <result property="logoffTime" column="logoffTime"/>
+        <result property="appKey" column="appKey"/>
+        <result property="appSecret" column="appSecret"/>
+        <result property="scanFlag" column="scanFlag"/>
+        <result property="userBeans" column="userBeans"/>
+        <result property="guideFlag" column="guideFlag"/>
+        <result property="loginFailTime" column="loginFailTime"/>
+        <result property="tipStatus" column="tipStatus"/>
+        <result property="onlineMoney" column="onlineMoney"/>
+        <result property="unionId" column="unionId"/>
+        <result property="openId" column="openId"/>
     </resultMap>
 
     <sql id="selectUserVo">
-        select
-            user.userID,
-            user.userOrganizeID,
-            user.account,
-            user.mobile,
-            user.bindMobile,
-            user.userPermission,
-            user.userIdentity,
-            user.email,
-            user.userName,
-            user.realName,
-            user.source,
-            user.image,
-            user.password,
-            user.name,
-            user.registerUserTypeID,
-            user.manufacturerStatus,
-            user.shopID,
-            user.auditStatus,
-            user.auditTime,
-            user.auditNote,
-            user.registerTime,
-            user.registerIP,
-            user.ipAddress,
-            user.loginTime,
-            user.loginIP,
-            user.validFlag,
-            user.clubStatus,
-            user.clubID,
-            user.agreeFlag,
-            user.serviceProviderStatus,
-            user.serviceProviderID,
-            ifnull(user.userMoney,0) AS userMoney,
-            ifnull(user.ableUserMoney,0) AS ableUserMoney,
-            user.logoffTime,
-            user.appKey,
-            user.appSecret,
-            user.scanFlag,
-            user.userBeans,
-            user.guideFlag,
-            user.loginFailTime,
-            user.tipStatus,
-            ifnull(user.onlineMoney,0) AS onlineMoney,
-            user.unionId,
-            user.openId
+        select user.userID,
+               user.userOrganizeID,
+               user.account,
+               user.mobile,
+               user.bindMobile,
+               user.userPermission,
+               user.userIdentity,
+               user.email,
+               user.userName,
+               user.realName,
+               user.source,
+               user.image,
+               user.password,
+               user.name,
+               user.registerUserTypeID,
+               user.manufacturerStatus,
+               user.shopID,
+               user.auditStatus,
+               user.auditTime,
+               user.auditNote,
+               user.registerTime,
+               user.registerIP,
+               user.ipAddress,
+               user.loginTime,
+               user.loginIP,
+               user.validFlag,
+               user.clubStatus,
+               user.clubID,
+               user.agreeFlag,
+               user.serviceProviderStatus,
+               user.serviceProviderID,
+               ifnull(user.userMoney, 0)     AS userMoney,
+               ifnull(user.ableUserMoney, 0) AS ableUserMoney,
+               user.logoffTime,
+               user.appKey,
+               user.appSecret,
+               user.scanFlag,
+               user.userBeans,
+               user.guideFlag,
+               user.loginFailTime,
+               user.tipStatus,
+               ifnull(user.onlineMoney, 0)   AS onlineMoney,
+               user.unionId,
+               user.openId
     </sql>
 
     <select id="getByUser" parameterType="User" resultMap="UserResult">
         <include refid="selectUserVo"/>
         from user AS user
-        <where>  user.delFlag = 0
-            <if test="userID != null  and userID != ''"> and user.userID = #{userID}</if>
-            <if test="userOrganizeID != null "> and user.userOrganizeID = #{userOrganizeID}</if>
-            <if test="account != null  and account != ''"> and user.account = #{account}</if>
-            <if test="mobile != null  and mobile != ''"> and user.mobile = #{mobile}</if>
-            <if test="bindMobile != null  and bindMobile != ''"> and user.bindMobile = #{bindMobile}</if>
-            <if test="userPermission != null "> and user.userPermission = #{userPermission}</if>
-            <if test="userIdentity != null "> and user.userIdentity = #{userIdentity}</if>
-            <if test="email != null  and email != ''"> and user.email = #{email}</if>
-            <if test="userName != null  and userName != ''"> and user.userName like concat('%', #{userName}, '%')</if>
-            <if test="realName != null  and realName != ''"> and user.realName like concat('%', #{realName}, '%')</if>
-            <if test="source != null  and source != ''"> and user.source = #{source}</if>
-            <if test="image != null  and image != ''"> and user.image = #{image}</if>
-            <if test="password != null  and password != ''"> and user.password = #{password}</if>
-            <if test="name != null  and name != ''"> and user.name like concat('%', #{name}, '%')</if>
-            <if test="registerUserTypeID != null  and registerUserTypeID != ''"> and user.registerUserTypeID = #{registerUserTypeID}</if>
-            <if test="manufacturerStatus != null "> and user.manufacturerStatus = #{manufacturerStatus}</if>
-            <if test="shopID != null "> and user.shopID = #{shopID}</if>
-            <if test="auditStatus != null  and auditStatus != ''"> and user.auditStatus = #{auditStatus}</if>
-            <if test="auditTime != null  and auditTime != ''"> and user.auditTime = #{auditTime}</if>
-            <if test="auditNote != null  and auditNote != ''"> and user.auditNote = #{auditNote}</if>
-            <if test="registerTime != null  and registerTime != ''"> and user.registerTime = #{registerTime}</if>
-            <if test="registerIP != null  and registerIP != ''"> and user.registerIP = #{registerIP}</if>
-            <if test="ipAddress != null  and ipAddress != ''"> and user.ipAddress = #{ipAddress}</if>
-            <if test="loginTime != null  and loginTime != ''"> and user.loginTime = #{loginTime}</if>
-            <if test="loginIP != null  and loginIP != ''"> and user.loginIP = #{loginIP}</if>
-            <if test="validFlag != null  and validFlag != ''"> and user.validFlag = #{validFlag}</if>
-            <if test="clubStatus != null "> and user.clubStatus = #{clubStatus}</if>
-            <if test="clubID != null "> and user.clubID = #{clubID}</if>
-            <if test="agreeFlag != null  and agreeFlag != ''"> and user.agreeFlag = #{agreeFlag}</if>
-            <if test="serviceProviderStatus != null "> and user.serviceProviderStatus = #{serviceProviderStatus}</if>
-            <if test="serviceProviderID != null "> and user.serviceProviderID = #{serviceProviderID}</if>
-            <if test="userMoney != null "> and user.userMoney = #{userMoney}</if>
-            <if test="ableUserMoney != null "> and user.ableUserMoney = #{ableUserMoney}</if>
-            <if test="logoffTime != null  and logoffTime != ''"> and user.logoffTime = #{logoffTime}</if>
-            <if test="appKey != null  and appKey != ''"> and user.appKey = #{appKey}</if>
-            <if test="appSecret != null  and appSecret != ''"> and user.appSecret = #{appSecret}</if>
-            <if test="scanFlag != null "> and user.scanFlag = #{scanFlag}</if>
-            <if test="userBeans != null "> and user.userBeans = #{userBeans}</if>
-            <if test="guideFlag != null "> and user.guideFlag = #{guideFlag}</if>
-            <if test="loginFailTime != null "> and user.loginFailTime = #{loginFailTime}</if>
-            <if test="tipStatus != null  and tipStatus != ''"> and user.tipStatus = #{tipStatus}</if>
-            <if test="onlineMoney != null "> and user.onlineMoney = #{onlineMoney}</if>
-            <if test="unionId != null  and unionId != ''"> and user.unionId = #{unionId}</if>
-            <if test="openId != null  and openId != ''"> and user.openId = #{openId}</if>
+        <where>user.delFlag = 0
+            <if test="userID != null  and userID != ''">and user.userID = #{userID}</if>
+            <if test="userOrganizeID != null ">and user.userOrganizeID = #{userOrganizeID}</if>
+            <if test="account != null  and account != ''">and user.account = #{account}</if>
+            <if test="mobile != null  and mobile != ''">and user.mobile = #{mobile}</if>
+            <if test="bindMobile != null  and bindMobile != ''">and user.bindMobile = #{bindMobile}</if>
+            <if test="userPermission != null ">and user.userPermission = #{userPermission}</if>
+            <if test="userIdentity != null ">and user.userIdentity = #{userIdentity}</if>
+            <if test="email != null  and email != ''">and user.email = #{email}</if>
+            <if test="userName != null  and userName != ''">and user.userName like concat('%', #{userName}, '%')</if>
+            <if test="realName != null  and realName != ''">and user.realName like concat('%', #{realName}, '%')</if>
+            <if test="source != null  and source != ''">and user.source = #{source}</if>
+            <if test="image != null  and image != ''">and user.image = #{image}</if>
+            <if test="password != null  and password != ''">and user.password = #{password}</if>
+            <if test="name != null  and name != ''">and user.name like concat('%', #{name}, '%')</if>
+            <if test="registerUserTypeID != null  and registerUserTypeID != ''">and user.registerUserTypeID =
+                #{registerUserTypeID}
+            </if>
+            <if test="manufacturerStatus != null ">and user.manufacturerStatus = #{manufacturerStatus}</if>
+            <if test="shopID != null ">and user.shopID = #{shopID}</if>
+            <if test="auditStatus != null  and auditStatus != ''">and user.auditStatus = #{auditStatus}</if>
+            <if test="auditTime != null  and auditTime != ''">and user.auditTime = #{auditTime}</if>
+            <if test="auditNote != null  and auditNote != ''">and user.auditNote = #{auditNote}</if>
+            <if test="registerTime != null  and registerTime != ''">and user.registerTime = #{registerTime}</if>
+            <if test="registerIP != null  and registerIP != ''">and user.registerIP = #{registerIP}</if>
+            <if test="ipAddress != null  and ipAddress != ''">and user.ipAddress = #{ipAddress}</if>
+            <if test="loginTime != null  and loginTime != ''">and user.loginTime = #{loginTime}</if>
+            <if test="loginIP != null  and loginIP != ''">and user.loginIP = #{loginIP}</if>
+            <if test="validFlag != null  and validFlag != ''">and user.validFlag = #{validFlag}</if>
+            <if test="clubStatus != null ">and user.clubStatus = #{clubStatus}</if>
+            <if test="clubID != null ">and user.clubID = #{clubID}</if>
+            <if test="agreeFlag != null  and agreeFlag != ''">and user.agreeFlag = #{agreeFlag}</if>
+            <if test="serviceProviderStatus != null ">and user.serviceProviderStatus = #{serviceProviderStatus}</if>
+            <if test="serviceProviderID != null ">and user.serviceProviderID = #{serviceProviderID}</if>
+            <if test="userMoney != null ">and user.userMoney = #{userMoney}</if>
+            <if test="ableUserMoney != null ">and user.ableUserMoney = #{ableUserMoney}</if>
+            <if test="logoffTime != null  and logoffTime != ''">and user.logoffTime = #{logoffTime}</if>
+            <if test="appKey != null  and appKey != ''">and user.appKey = #{appKey}</if>
+            <if test="appSecret != null  and appSecret != ''">and user.appSecret = #{appSecret}</if>
+            <if test="scanFlag != null ">and user.scanFlag = #{scanFlag}</if>
+            <if test="userBeans != null ">and user.userBeans = #{userBeans}</if>
+            <if test="guideFlag != null ">and user.guideFlag = #{guideFlag}</if>
+            <if test="loginFailTime != null ">and user.loginFailTime = #{loginFailTime}</if>
+            <if test="tipStatus != null  and tipStatus != ''">and user.tipStatus = #{tipStatus}</if>
+            <if test="onlineMoney != null ">and user.onlineMoney = #{onlineMoney}</if>
+            <if test="unionId != null  and unionId != ''">and user.unionId = #{unionId}</if>
+            <if test="openId != null  and openId != ''">and user.openId = #{openId}</if>
         </where>
         group by user.userID
         limit 0,1
@@ -155,51 +156,53 @@
     <select id="getUserList" parameterType="User" resultMap="UserResult">
         <include refid="selectUserVo"/>
         from user AS user
-        <where>  user.delFlag = 0
-            <if test="userID != null  and userID != ''"> and user.userID = #{userID}</if>
-            <if test="userOrganizeID != null "> and user.userOrganizeID = #{userOrganizeID}</if>
-            <if test="account != null  and account != ''"> and user.account = #{account}</if>
-            <if test="mobile != null  and mobile != ''"> and user.mobile = #{mobile}</if>
-            <if test="bindMobile != null  and bindMobile != ''"> and user.bindMobile = #{bindMobile}</if>
-            <if test="userPermission != null "> and user.userPermission = #{userPermission}</if>
-            <if test="userIdentity != null "> and user.userIdentity = #{userIdentity}</if>
-            <if test="email != null  and email != ''"> and user.email = #{email}</if>
-            <if test="userName != null  and userName != ''"> and user.userName like concat('%', #{userName}, '%')</if>
-            <if test="realName != null  and realName != ''"> and user.realName like concat('%', #{realName}, '%')</if>
-            <if test="source != null  and source != ''"> and user.source = #{source}</if>
-            <if test="image != null  and image != ''"> and user.image = #{image}</if>
-            <if test="password != null  and password != ''"> and user.password = #{password}</if>
-            <if test="name != null  and name != ''"> and user.name like concat('%', #{name}, '%')</if>
-            <if test="registerUserTypeID != null  and registerUserTypeID != ''"> and user.registerUserTypeID = #{registerUserTypeID}</if>
-            <if test="manufacturerStatus != null "> and user.manufacturerStatus = #{manufacturerStatus}</if>
-            <if test="shopID != null "> and user.shopID = #{shopID}</if>
-            <if test="auditStatus != null  and auditStatus != ''"> and user.auditStatus = #{auditStatus}</if>
-            <if test="auditTime != null  and auditTime != ''"> and user.auditTime = #{auditTime}</if>
-            <if test="auditNote != null  and auditNote != ''"> and user.auditNote = #{auditNote}</if>
-            <if test="registerTime != null  and registerTime != ''"> and user.registerTime = #{registerTime}</if>
-            <if test="registerIP != null  and registerIP != ''"> and user.registerIP = #{registerIP}</if>
-            <if test="ipAddress != null  and ipAddress != ''"> and user.ipAddress = #{ipAddress}</if>
-            <if test="loginTime != null  and loginTime != ''"> and user.loginTime = #{loginTime}</if>
-            <if test="loginIP != null  and loginIP != ''"> and user.loginIP = #{loginIP}</if>
-            <if test="validFlag != null  and validFlag != ''"> and user.validFlag = #{validFlag}</if>
-            <if test="clubStatus != null "> and user.clubStatus = #{clubStatus}</if>
-            <if test="clubID != null "> and user.clubID = #{clubID}</if>
-            <if test="agreeFlag != null  and agreeFlag != ''"> and user.agreeFlag = #{agreeFlag}</if>
-            <if test="serviceProviderStatus != null "> and user.serviceProviderStatus = #{serviceProviderStatus}</if>
-            <if test="serviceProviderID != null "> and user.serviceProviderID = #{serviceProviderID}</if>
-            <if test="userMoney != null "> and user.userMoney = #{userMoney}</if>
-            <if test="ableUserMoney != null "> and user.ableUserMoney = #{ableUserMoney}</if>
-            <if test="logoffTime != null  and logoffTime != ''"> and user.logoffTime = #{logoffTime}</if>
-            <if test="appKey != null  and appKey != ''"> and user.appKey = #{appKey}</if>
-            <if test="appSecret != null  and appSecret != ''"> and user.appSecret = #{appSecret}</if>
-            <if test="scanFlag != null "> and user.scanFlag = #{scanFlag}</if>
-            <if test="userBeans != null "> and user.userBeans = #{userBeans}</if>
-            <if test="guideFlag != null "> and user.guideFlag = #{guideFlag}</if>
-            <if test="loginFailTime != null "> and user.loginFailTime = #{loginFailTime}</if>
-            <if test="tipStatus != null  and tipStatus != ''"> and user.tipStatus = #{tipStatus}</if>
-            <if test="onlineMoney != null "> and user.onlineMoney = #{onlineMoney}</if>
-            <if test="unionId != null  and unionId != ''"> and user.unionId = #{unionId}</if>
-            <if test="openId != null  and openId != ''"> and user.openId = #{openId}</if>
+        <where>user.delFlag = 0
+            <if test="userID != null  and userID != ''">and user.userID = #{userID}</if>
+            <if test="userOrganizeID != null ">and user.userOrganizeID = #{userOrganizeID}</if>
+            <if test="account != null  and account != ''">and user.account = #{account}</if>
+            <if test="mobile != null  and mobile != ''">and user.mobile = #{mobile}</if>
+            <if test="bindMobile != null  and bindMobile != ''">and user.bindMobile = #{bindMobile}</if>
+            <if test="userPermission != null ">and user.userPermission = #{userPermission}</if>
+            <if test="userIdentity != null ">and user.userIdentity = #{userIdentity}</if>
+            <if test="email != null  and email != ''">and user.email = #{email}</if>
+            <if test="userName != null  and userName != ''">and user.userName like concat('%', #{userName}, '%')</if>
+            <if test="realName != null  and realName != ''">and user.realName like concat('%', #{realName}, '%')</if>
+            <if test="source != null  and source != ''">and user.source = #{source}</if>
+            <if test="image != null  and image != ''">and user.image = #{image}</if>
+            <if test="password != null  and password != ''">and user.password = #{password}</if>
+            <if test="name != null  and name != ''">and user.name like concat('%', #{name}, '%')</if>
+            <if test="registerUserTypeID != null  and registerUserTypeID != ''">and user.registerUserTypeID =
+                #{registerUserTypeID}
+            </if>
+            <if test="manufacturerStatus != null ">and user.manufacturerStatus = #{manufacturerStatus}</if>
+            <if test="shopID != null ">and user.shopID = #{shopID}</if>
+            <if test="auditStatus != null  and auditStatus != ''">and user.auditStatus = #{auditStatus}</if>
+            <if test="auditTime != null  and auditTime != ''">and user.auditTime = #{auditTime}</if>
+            <if test="auditNote != null  and auditNote != ''">and user.auditNote = #{auditNote}</if>
+            <if test="registerTime != null  and registerTime != ''">and user.registerTime = #{registerTime}</if>
+            <if test="registerIP != null  and registerIP != ''">and user.registerIP = #{registerIP}</if>
+            <if test="ipAddress != null  and ipAddress != ''">and user.ipAddress = #{ipAddress}</if>
+            <if test="loginTime != null  and loginTime != ''">and user.loginTime = #{loginTime}</if>
+            <if test="loginIP != null  and loginIP != ''">and user.loginIP = #{loginIP}</if>
+            <if test="validFlag != null  and validFlag != ''">and user.validFlag = #{validFlag}</if>
+            <if test="clubStatus != null ">and user.clubStatus = #{clubStatus}</if>
+            <if test="clubID != null ">and user.clubID = #{clubID}</if>
+            <if test="agreeFlag != null  and agreeFlag != ''">and user.agreeFlag = #{agreeFlag}</if>
+            <if test="serviceProviderStatus != null ">and user.serviceProviderStatus = #{serviceProviderStatus}</if>
+            <if test="serviceProviderID != null ">and user.serviceProviderID = #{serviceProviderID}</if>
+            <if test="userMoney != null ">and user.userMoney = #{userMoney}</if>
+            <if test="ableUserMoney != null ">and user.ableUserMoney = #{ableUserMoney}</if>
+            <if test="logoffTime != null  and logoffTime != ''">and user.logoffTime = #{logoffTime}</if>
+            <if test="appKey != null  and appKey != ''">and user.appKey = #{appKey}</if>
+            <if test="appSecret != null  and appSecret != ''">and user.appSecret = #{appSecret}</if>
+            <if test="scanFlag != null ">and user.scanFlag = #{scanFlag}</if>
+            <if test="userBeans != null ">and user.userBeans = #{userBeans}</if>
+            <if test="guideFlag != null ">and user.guideFlag = #{guideFlag}</if>
+            <if test="loginFailTime != null ">and user.loginFailTime = #{loginFailTime}</if>
+            <if test="tipStatus != null  and tipStatus != ''">and user.tipStatus = #{tipStatus}</if>
+            <if test="onlineMoney != null ">and user.onlineMoney = #{onlineMoney}</if>
+            <if test="unionId != null  and unionId != ''">and user.unionId = #{unionId}</if>
+            <if test="openId != null  and openId != ''">and user.openId = #{openId}</if>
         </where>
         group by user.userID
         order by user.createTime desc
@@ -208,122 +211,136 @@
     <select id="getCount" parameterType="User" resultType="int">
         select count(1)
         from user AS user
-        <where>  user.delFlag = 0
-            <if test="userID != null  and userID != ''"> and user.userID = #{userID}</if>
-            <if test="userOrganizeID != null "> and user.userOrganizeID = #{userOrganizeID}</if>
-            <if test="account != null  and account != ''"> and user.account = #{account}</if>
-            <if test="mobile != null  and mobile != ''"> and user.mobile = #{mobile}</if>
-            <if test="bindMobile != null  and bindMobile != ''"> and user.bindMobile = #{bindMobile}</if>
-            <if test="userPermission != null "> and user.userPermission = #{userPermission}</if>
-            <if test="userIdentity != null "> and user.userIdentity = #{userIdentity}</if>
-            <if test="email != null  and email != ''"> and user.email = #{email}</if>
-            <if test="userName != null  and userName != ''"> and user.userName like concat('%', #{userName}, '%')</if>
-            <if test="realName != null  and realName != ''"> and user.realName like concat('%', #{realName}, '%')</if>
-            <if test="source != null  and source != ''"> and user.source = #{source}</if>
-            <if test="image != null  and image != ''"> and user.image = #{image}</if>
-            <if test="password != null  and password != ''"> and user.password = #{password}</if>
-            <if test="name != null  and name != ''"> and user.name like concat('%', #{name}, '%')</if>
-            <if test="registerUserTypeID != null  and registerUserTypeID != ''"> and user.registerUserTypeID = #{registerUserTypeID}</if>
-            <if test="manufacturerStatus != null "> and user.manufacturerStatus = #{manufacturerStatus}</if>
-            <if test="shopID != null "> and user.shopID = #{shopID}</if>
-            <if test="auditStatus != null  and auditStatus != ''"> and user.auditStatus = #{auditStatus}</if>
-            <if test="auditTime != null  and auditTime != ''"> and user.auditTime = #{auditTime}</if>
-            <if test="auditNote != null  and auditNote != ''"> and user.auditNote = #{auditNote}</if>
-            <if test="registerTime != null  and registerTime != ''"> and user.registerTime = #{registerTime}</if>
-            <if test="registerIP != null  and registerIP != ''"> and user.registerIP = #{registerIP}</if>
-            <if test="ipAddress != null  and ipAddress != ''"> and user.ipAddress = #{ipAddress}</if>
-            <if test="loginTime != null  and loginTime != ''"> and user.loginTime = #{loginTime}</if>
-            <if test="loginIP != null  and loginIP != ''"> and user.loginIP = #{loginIP}</if>
-            <if test="validFlag != null  and validFlag != ''"> and user.validFlag = #{validFlag}</if>
-            <if test="clubStatus != null "> and user.clubStatus = #{clubStatus}</if>
-            <if test="clubID != null "> and user.clubID = #{clubID}</if>
-            <if test="agreeFlag != null  and agreeFlag != ''"> and user.agreeFlag = #{agreeFlag}</if>
-            <if test="serviceProviderStatus != null "> and user.serviceProviderStatus = #{serviceProviderStatus}</if>
-            <if test="serviceProviderID != null "> and user.serviceProviderID = #{serviceProviderID}</if>
-            <if test="userMoney != null "> and user.userMoney = #{userMoney}</if>
-            <if test="ableUserMoney != null "> and user.ableUserMoney = #{ableUserMoney}</if>
-            <if test="logoffTime != null  and logoffTime != ''"> and user.logoffTime = #{logoffTime}</if>
-            <if test="appKey != null  and appKey != ''"> and user.appKey = #{appKey}</if>
-            <if test="appSecret != null  and appSecret != ''"> and user.appSecret = #{appSecret}</if>
-            <if test="scanFlag != null "> and user.scanFlag = #{scanFlag}</if>
-            <if test="userBeans != null "> and user.userBeans = #{userBeans}</if>
-            <if test="guideFlag != null "> and user.guideFlag = #{guideFlag}</if>
-            <if test="loginFailTime != null "> and user.loginFailTime = #{loginFailTime}</if>
-            <if test="tipStatus != null  and tipStatus != ''"> and user.tipStatus = #{tipStatus}</if>
-            <if test="onlineMoney != null "> and user.onlineMoney = #{onlineMoney}</if>
-            <if test="unionId != null  and unionId != ''"> and user.unionId = #{unionId}</if>
-            <if test="openId != null  and openId != ''"> and user.openId = #{openId}</if>
+        <where>user.delFlag = 0
+            <if test="userID != null  and userID != ''">and user.userID = #{userID}</if>
+            <if test="userOrganizeID != null ">and user.userOrganizeID = #{userOrganizeID}</if>
+            <if test="account != null  and account != ''">and user.account = #{account}</if>
+            <if test="mobile != null  and mobile != ''">and user.mobile = #{mobile}</if>
+            <if test="bindMobile != null  and bindMobile != ''">and user.bindMobile = #{bindMobile}</if>
+            <if test="userPermission != null ">and user.userPermission = #{userPermission}</if>
+            <if test="userIdentity != null ">and user.userIdentity = #{userIdentity}</if>
+            <if test="email != null  and email != ''">and user.email = #{email}</if>
+            <if test="userName != null  and userName != ''">and user.userName like concat('%', #{userName}, '%')</if>
+            <if test="realName != null  and realName != ''">and user.realName like concat('%', #{realName}, '%')</if>
+            <if test="source != null  and source != ''">and user.source = #{source}</if>
+            <if test="image != null  and image != ''">and user.image = #{image}</if>
+            <if test="password != null  and password != ''">and user.password = #{password}</if>
+            <if test="name != null  and name != ''">and user.name like concat('%', #{name}, '%')</if>
+            <if test="registerUserTypeID != null  and registerUserTypeID != ''">and user.registerUserTypeID =
+                #{registerUserTypeID}
+            </if>
+            <if test="manufacturerStatus != null ">and user.manufacturerStatus = #{manufacturerStatus}</if>
+            <if test="shopID != null ">and user.shopID = #{shopID}</if>
+            <if test="auditStatus != null  and auditStatus != ''">and user.auditStatus = #{auditStatus}</if>
+            <if test="auditTime != null  and auditTime != ''">and user.auditTime = #{auditTime}</if>
+            <if test="auditNote != null  and auditNote != ''">and user.auditNote = #{auditNote}</if>
+            <if test="registerTime != null  and registerTime != ''">and user.registerTime = #{registerTime}</if>
+            <if test="registerIP != null  and registerIP != ''">and user.registerIP = #{registerIP}</if>
+            <if test="ipAddress != null  and ipAddress != ''">and user.ipAddress = #{ipAddress}</if>
+            <if test="loginTime != null  and loginTime != ''">and user.loginTime = #{loginTime}</if>
+            <if test="loginIP != null  and loginIP != ''">and user.loginIP = #{loginIP}</if>
+            <if test="validFlag != null  and validFlag != ''">and user.validFlag = #{validFlag}</if>
+            <if test="clubStatus != null ">and user.clubStatus = #{clubStatus}</if>
+            <if test="clubID != null ">and user.clubID = #{clubID}</if>
+            <if test="agreeFlag != null  and agreeFlag != ''">and user.agreeFlag = #{agreeFlag}</if>
+            <if test="serviceProviderStatus != null ">and user.serviceProviderStatus = #{serviceProviderStatus}</if>
+            <if test="serviceProviderID != null ">and user.serviceProviderID = #{serviceProviderID}</if>
+            <if test="userMoney != null ">and user.userMoney = #{userMoney}</if>
+            <if test="ableUserMoney != null ">and user.ableUserMoney = #{ableUserMoney}</if>
+            <if test="logoffTime != null  and logoffTime != ''">and user.logoffTime = #{logoffTime}</if>
+            <if test="appKey != null  and appKey != ''">and user.appKey = #{appKey}</if>
+            <if test="appSecret != null  and appSecret != ''">and user.appSecret = #{appSecret}</if>
+            <if test="scanFlag != null ">and user.scanFlag = #{scanFlag}</if>
+            <if test="userBeans != null ">and user.userBeans = #{userBeans}</if>
+            <if test="guideFlag != null ">and user.guideFlag = #{guideFlag}</if>
+            <if test="loginFailTime != null ">and user.loginFailTime = #{loginFailTime}</if>
+            <if test="tipStatus != null  and tipStatus != ''">and user.tipStatus = #{tipStatus}</if>
+            <if test="onlineMoney != null ">and user.onlineMoney = #{onlineMoney}</if>
+            <if test="unionId != null  and unionId != ''">and user.unionId = #{unionId}</if>
+            <if test="openId != null  and openId != ''">and user.openId = #{openId}</if>
         </where>
     </select>
 
     <select id="getUserById" parameterType="String" resultMap="UserResult">
         <include refid="selectUserVo"/>
         from user AS user
-        where  user.delFlag = 0 and user.userID = #{userID}
+        where user.delFlag = 0 and user.userID = #{userID}
     </select>
 
 
     <select id="getById" parameterType="User" resultType="String">
         select userID
         from user AS user
-        <where>  user.delFlag = 0
-            <if test="userID != null  and userID != ''"> and user.userID = #{userID}</if>
-            <if test="userOrganizeID != null "> and user.userOrganizeID = #{userOrganizeID}</if>
-            <if test="account != null  and account != ''"> and user.account = #{account}</if>
-            <if test="mobile != null  and mobile != ''"> and user.mobile = #{mobile}</if>
-            <if test="bindMobile != null  and bindMobile != ''"> and user.bindMobile = #{bindMobile}</if>
-            <if test="userPermission != null "> and user.userPermission = #{userPermission}</if>
-            <if test="userIdentity != null "> and user.userIdentity = #{userIdentity}</if>
-            <if test="email != null  and email != ''"> and user.email = #{email}</if>
-            <if test="userName != null  and userName != ''"> and user.userName like concat('%', #{userName}, '%')</if>
-            <if test="realName != null  and realName != ''"> and user.realName like concat('%', #{realName}, '%')</if>
-            <if test="source != null  and source != ''"> and user.source = #{source}</if>
-            <if test="image != null  and image != ''"> and user.image = #{image}</if>
-            <if test="password != null  and password != ''"> and user.password = #{password}</if>
-            <if test="name != null  and name != ''"> and user.name like concat('%', #{name}, '%')</if>
-            <if test="registerUserTypeID != null  and registerUserTypeID != ''"> and user.registerUserTypeID = #{registerUserTypeID}</if>
-            <if test="manufacturerStatus != null "> and user.manufacturerStatus = #{manufacturerStatus}</if>
-            <if test="shopID != null "> and user.shopID = #{shopID}</if>
-            <if test="auditStatus != null  and auditStatus != ''"> and user.auditStatus = #{auditStatus}</if>
-            <if test="auditTime != null  and auditTime != ''"> and user.auditTime = #{auditTime}</if>
-            <if test="auditNote != null  and auditNote != ''"> and user.auditNote = #{auditNote}</if>
-            <if test="registerTime != null  and registerTime != ''"> and user.registerTime = #{registerTime}</if>
-            <if test="registerIP != null  and registerIP != ''"> and user.registerIP = #{registerIP}</if>
-            <if test="ipAddress != null  and ipAddress != ''"> and user.ipAddress = #{ipAddress}</if>
-            <if test="loginTime != null  and loginTime != ''"> and user.loginTime = #{loginTime}</if>
-            <if test="loginIP != null  and loginIP != ''"> and user.loginIP = #{loginIP}</if>
-            <if test="validFlag != null  and validFlag != ''"> and user.validFlag = #{validFlag}</if>
-            <if test="clubStatus != null "> and user.clubStatus = #{clubStatus}</if>
-            <if test="clubID != null "> and user.clubID = #{clubID}</if>
-            <if test="agreeFlag != null  and agreeFlag != ''"> and user.agreeFlag = #{agreeFlag}</if>
-            <if test="serviceProviderStatus != null "> and user.serviceProviderStatus = #{serviceProviderStatus}</if>
-            <if test="serviceProviderID != null "> and user.serviceProviderID = #{serviceProviderID}</if>
-            <if test="userMoney != null "> and user.userMoney = #{userMoney}</if>
-            <if test="ableUserMoney != null "> and user.ableUserMoney = #{ableUserMoney}</if>
-            <if test="logoffTime != null  and logoffTime != ''"> and user.logoffTime = #{logoffTime}</if>
-            <if test="appKey != null  and appKey != ''"> and user.appKey = #{appKey}</if>
-            <if test="appSecret != null  and appSecret != ''"> and user.appSecret = #{appSecret}</if>
-            <if test="scanFlag != null "> and user.scanFlag = #{scanFlag}</if>
-            <if test="userBeans != null "> and user.userBeans = #{userBeans}</if>
-            <if test="guideFlag != null "> and user.guideFlag = #{guideFlag}</if>
-            <if test="loginFailTime != null "> and user.loginFailTime = #{loginFailTime}</if>
-            <if test="tipStatus != null  and tipStatus != ''"> and user.tipStatus = #{tipStatus}</if>
-            <if test="onlineMoney != null "> and user.onlineMoney = #{onlineMoney}</if>
-            <if test="unionId != null  and unionId != ''"> and user.unionId = #{unionId}</if>
-            <if test="openId != null  and openId != ''"> and user.openId = #{openId}</if>
+        <where>user.delFlag = 0
+            <if test="userID != null  and userID != ''">and user.userID = #{userID}</if>
+            <if test="userOrganizeID != null ">and user.userOrganizeID = #{userOrganizeID}</if>
+            <if test="account != null  and account != ''">and user.account = #{account}</if>
+            <if test="mobile != null  and mobile != ''">and user.mobile = #{mobile}</if>
+            <if test="bindMobile != null  and bindMobile != ''">and user.bindMobile = #{bindMobile}</if>
+            <if test="userPermission != null ">and user.userPermission = #{userPermission}</if>
+            <if test="userIdentity != null ">and user.userIdentity = #{userIdentity}</if>
+            <if test="email != null  and email != ''">and user.email = #{email}</if>
+            <if test="userName != null  and userName != ''">and user.userName like concat('%', #{userName}, '%')</if>
+            <if test="realName != null  and realName != ''">and user.realName like concat('%', #{realName}, '%')</if>
+            <if test="source != null  and source != ''">and user.source = #{source}</if>
+            <if test="image != null  and image != ''">and user.image = #{image}</if>
+            <if test="password != null  and password != ''">and user.password = #{password}</if>
+            <if test="name != null  and name != ''">and user.name like concat('%', #{name}, '%')</if>
+            <if test="registerUserTypeID != null  and registerUserTypeID != ''">and user.registerUserTypeID =
+                #{registerUserTypeID}
+            </if>
+            <if test="manufacturerStatus != null ">and user.manufacturerStatus = #{manufacturerStatus}</if>
+            <if test="shopID != null ">and user.shopID = #{shopID}</if>
+            <if test="auditStatus != null  and auditStatus != ''">and user.auditStatus = #{auditStatus}</if>
+            <if test="auditTime != null  and auditTime != ''">and user.auditTime = #{auditTime}</if>
+            <if test="auditNote != null  and auditNote != ''">and user.auditNote = #{auditNote}</if>
+            <if test="registerTime != null  and registerTime != ''">and user.registerTime = #{registerTime}</if>
+            <if test="registerIP != null  and registerIP != ''">and user.registerIP = #{registerIP}</if>
+            <if test="ipAddress != null  and ipAddress != ''">and user.ipAddress = #{ipAddress}</if>
+            <if test="loginTime != null  and loginTime != ''">and user.loginTime = #{loginTime}</if>
+            <if test="loginIP != null  and loginIP != ''">and user.loginIP = #{loginIP}</if>
+            <if test="validFlag != null  and validFlag != ''">and user.validFlag = #{validFlag}</if>
+            <if test="clubStatus != null ">and user.clubStatus = #{clubStatus}</if>
+            <if test="clubID != null ">and user.clubID = #{clubID}</if>
+            <if test="agreeFlag != null  and agreeFlag != ''">and user.agreeFlag = #{agreeFlag}</if>
+            <if test="serviceProviderStatus != null ">and user.serviceProviderStatus = #{serviceProviderStatus}</if>
+            <if test="serviceProviderID != null ">and user.serviceProviderID = #{serviceProviderID}</if>
+            <if test="userMoney != null ">and user.userMoney = #{userMoney}</if>
+            <if test="ableUserMoney != null ">and user.ableUserMoney = #{ableUserMoney}</if>
+            <if test="logoffTime != null  and logoffTime != ''">and user.logoffTime = #{logoffTime}</if>
+            <if test="appKey != null  and appKey != ''">and user.appKey = #{appKey}</if>
+            <if test="appSecret != null  and appSecret != ''">and user.appSecret = #{appSecret}</if>
+            <if test="scanFlag != null ">and user.scanFlag = #{scanFlag}</if>
+            <if test="userBeans != null ">and user.userBeans = #{userBeans}</if>
+            <if test="guideFlag != null ">and user.guideFlag = #{guideFlag}</if>
+            <if test="loginFailTime != null ">and user.loginFailTime = #{loginFailTime}</if>
+            <if test="tipStatus != null  and tipStatus != ''">and user.tipStatus = #{tipStatus}</if>
+            <if test="onlineMoney != null ">and user.onlineMoney = #{onlineMoney}</if>
+            <if test="unionId != null  and unionId != ''">and user.unionId = #{unionId}</if>
+            <if test="openId != null  and openId != ''">and user.openId = #{openId}</if>
         </where>
         group by user.userID
         limit 0,1
     </select>
 
     <select id="findTicketList" resultType="com.caimei365.manager.entity.caimei.ZylTicket">
-        select userId,bindTime,ticketId,name,shopIds,giftFlag,mobile
-        from cm_zyl_ticket
+        select czt.userId                       as userId,
+               czt.bindTime                     as bindTime,
+               czt.ticketId                     as ticketId,
+               ifnull(czt.name, u.userName)     as name,
+               czt.shopIds                      as shopIds,
+               czt.giftFlag                     as giftFlag,
+               ifnull(czt.mobile, u.bindMobile) as mobile
+        from cm_zyl_ticket czt
+         left join user u on czt.userId = u.userId
+        <if test="mobile != null and mobile !=''">
+            where czt.mobile = #{mobile} or u.bindMobile = #{mobile}
+        </if>
         ORDER BY bindTime DESC
     </select>
 
     <select id="findShops" resultType="com.caimei365.manager.entity.ZylShop">
-        select id,shopName
+        select id, shopName
         from cm_zyl_shop
     </select>
     <select id="findShopIds" resultType="java.lang.String">
@@ -444,7 +461,9 @@
             <if test="image != null and image != ''">image = #{image},</if>
             <if test="password != null and password != ''">password = #{password},</if>
             <if test="name != null and name != ''">name = #{name},</if>
-            <if test="registerUserTypeID != null and registerUserTypeID != ''">registerUserTypeID = #{registerUserTypeID},</if>
+            <if test="registerUserTypeID != null and registerUserTypeID != ''">registerUserTypeID =
+                #{registerUserTypeID},
+            </if>
             <if test="manufacturerStatus != null">manufacturerStatus = #{manufacturerStatus},</if>
             <if test="shopID != null">shopID = #{shopID},</if>
             <if test="auditStatus != null and auditStatus != ''">auditStatus = #{auditStatus},</if>
@@ -479,62 +498,66 @@
     </update>
 
     <update id="updateGift">
-        update cm_zyl_ticket set giftFlag = 1
+        update cm_zyl_ticket
+        set giftFlag = 1
     </update>
 
     <delete id="delUserByUserID" parameterType="String">
         delete
-        from user where userID = #{userID}
+        from user
+        where userID = #{userID}
     </delete>
 
     <delete id="delUser" parameterType="User">
         delete
         from user AS user
         <where>
-            <if test="userID != null  and userID != ''"> and user.userID = #{userID}</if>
-            <if test="userOrganizeID != null "> and user.userOrganizeID = #{userOrganizeID}</if>
-            <if test="account != null  and account != ''"> and user.account = #{account}</if>
-            <if test="mobile != null  and mobile != ''"> and user.mobile = #{mobile}</if>
-            <if test="bindMobile != null  and bindMobile != ''"> and user.bindMobile = #{bindMobile}</if>
-            <if test="userPermission != null "> and user.userPermission = #{userPermission}</if>
-            <if test="userIdentity != null "> and user.userIdentity = #{userIdentity}</if>
-            <if test="email != null  and email != ''"> and user.email = #{email}</if>
-            <if test="userName != null  and userName != ''"> and user.userName like concat('%', #{userName}, '%')</if>
-            <if test="realName != null  and realName != ''"> and user.realName like concat('%', #{realName}, '%')</if>
-            <if test="source != null  and source != ''"> and user.source = #{source}</if>
-            <if test="image != null  and image != ''"> and user.image = #{image}</if>
-            <if test="password != null  and password != ''"> and user.password = #{password}</if>
-            <if test="name != null  and name != ''"> and user.name like concat('%', #{name}, '%')</if>
-            <if test="registerUserTypeID != null  and registerUserTypeID != ''"> and user.registerUserTypeID = #{registerUserTypeID}</if>
-            <if test="manufacturerStatus != null "> and user.manufacturerStatus = #{manufacturerStatus}</if>
-            <if test="shopID != null "> and user.shopID = #{shopID}</if>
-            <if test="auditStatus != null  and auditStatus != ''"> and user.auditStatus = #{auditStatus}</if>
-            <if test="auditTime != null  and auditTime != ''"> and user.auditTime = #{auditTime}</if>
-            <if test="auditNote != null  and auditNote != ''"> and user.auditNote = #{auditNote}</if>
-            <if test="registerTime != null  and registerTime != ''"> and user.registerTime = #{registerTime}</if>
-            <if test="registerIP != null  and registerIP != ''"> and user.registerIP = #{registerIP}</if>
-            <if test="ipAddress != null  and ipAddress != ''"> and user.ipAddress = #{ipAddress}</if>
-            <if test="loginTime != null  and loginTime != ''"> and user.loginTime = #{loginTime}</if>
-            <if test="loginIP != null  and loginIP != ''"> and user.loginIP = #{loginIP}</if>
-            <if test="validFlag != null  and validFlag != ''"> and user.validFlag = #{validFlag}</if>
-            <if test="clubStatus != null "> and user.clubStatus = #{clubStatus}</if>
-            <if test="clubID != null "> and user.clubID = #{clubID}</if>
-            <if test="agreeFlag != null  and agreeFlag != ''"> and user.agreeFlag = #{agreeFlag}</if>
-            <if test="serviceProviderStatus != null "> and user.serviceProviderStatus = #{serviceProviderStatus}</if>
-            <if test="serviceProviderID != null "> and user.serviceProviderID = #{serviceProviderID}</if>
-            <if test="userMoney != null "> and user.userMoney = #{userMoney}</if>
-            <if test="ableUserMoney != null "> and user.ableUserMoney = #{ableUserMoney}</if>
-            <if test="logoffTime != null  and logoffTime != ''"> and user.logoffTime = #{logoffTime}</if>
-            <if test="appKey != null  and appKey != ''"> and user.appKey = #{appKey}</if>
-            <if test="appSecret != null  and appSecret != ''"> and user.appSecret = #{appSecret}</if>
-            <if test="scanFlag != null "> and user.scanFlag = #{scanFlag}</if>
-            <if test="userBeans != null "> and user.userBeans = #{userBeans}</if>
-            <if test="guideFlag != null "> and user.guideFlag = #{guideFlag}</if>
-            <if test="loginFailTime != null "> and user.loginFailTime = #{loginFailTime}</if>
-            <if test="tipStatus != null  and tipStatus != ''"> and user.tipStatus = #{tipStatus}</if>
-            <if test="onlineMoney != null "> and user.onlineMoney = #{onlineMoney}</if>
-            <if test="unionId != null  and unionId != ''"> and user.unionId = #{unionId}</if>
-            <if test="openId != null  and openId != ''"> and user.openId = #{openId}</if>
+            <if test="userID != null  and userID != ''">and user.userID = #{userID}</if>
+            <if test="userOrganizeID != null ">and user.userOrganizeID = #{userOrganizeID}</if>
+            <if test="account != null  and account != ''">and user.account = #{account}</if>
+            <if test="mobile != null  and mobile != ''">and user.mobile = #{mobile}</if>
+            <if test="bindMobile != null  and bindMobile != ''">and user.bindMobile = #{bindMobile}</if>
+            <if test="userPermission != null ">and user.userPermission = #{userPermission}</if>
+            <if test="userIdentity != null ">and user.userIdentity = #{userIdentity}</if>
+            <if test="email != null  and email != ''">and user.email = #{email}</if>
+            <if test="userName != null  and userName != ''">and user.userName like concat('%', #{userName}, '%')</if>
+            <if test="realName != null  and realName != ''">and user.realName like concat('%', #{realName}, '%')</if>
+            <if test="source != null  and source != ''">and user.source = #{source}</if>
+            <if test="image != null  and image != ''">and user.image = #{image}</if>
+            <if test="password != null  and password != ''">and user.password = #{password}</if>
+            <if test="name != null  and name != ''">and user.name like concat('%', #{name}, '%')</if>
+            <if test="registerUserTypeID != null  and registerUserTypeID != ''">and user.registerUserTypeID =
+                #{registerUserTypeID}
+            </if>
+            <if test="manufacturerStatus != null ">and user.manufacturerStatus = #{manufacturerStatus}</if>
+            <if test="shopID != null ">and user.shopID = #{shopID}</if>
+            <if test="auditStatus != null  and auditStatus != ''">and user.auditStatus = #{auditStatus}</if>
+            <if test="auditTime != null  and auditTime != ''">and user.auditTime = #{auditTime}</if>
+            <if test="auditNote != null  and auditNote != ''">and user.auditNote = #{auditNote}</if>
+            <if test="registerTime != null  and registerTime != ''">and user.registerTime = #{registerTime}</if>
+            <if test="registerIP != null  and registerIP != ''">and user.registerIP = #{registerIP}</if>
+            <if test="ipAddress != null  and ipAddress != ''">and user.ipAddress = #{ipAddress}</if>
+            <if test="loginTime != null  and loginTime != ''">and user.loginTime = #{loginTime}</if>
+            <if test="loginIP != null  and loginIP != ''">and user.loginIP = #{loginIP}</if>
+            <if test="validFlag != null  and validFlag != ''">and user.validFlag = #{validFlag}</if>
+            <if test="clubStatus != null ">and user.clubStatus = #{clubStatus}</if>
+            <if test="clubID != null ">and user.clubID = #{clubID}</if>
+            <if test="agreeFlag != null  and agreeFlag != ''">and user.agreeFlag = #{agreeFlag}</if>
+            <if test="serviceProviderStatus != null ">and user.serviceProviderStatus = #{serviceProviderStatus}</if>
+            <if test="serviceProviderID != null ">and user.serviceProviderID = #{serviceProviderID}</if>
+            <if test="userMoney != null ">and user.userMoney = #{userMoney}</if>
+            <if test="ableUserMoney != null ">and user.ableUserMoney = #{ableUserMoney}</if>
+            <if test="logoffTime != null  and logoffTime != ''">and user.logoffTime = #{logoffTime}</if>
+            <if test="appKey != null  and appKey != ''">and user.appKey = #{appKey}</if>
+            <if test="appSecret != null  and appSecret != ''">and user.appSecret = #{appSecret}</if>
+            <if test="scanFlag != null ">and user.scanFlag = #{scanFlag}</if>
+            <if test="userBeans != null ">and user.userBeans = #{userBeans}</if>
+            <if test="guideFlag != null ">and user.guideFlag = #{guideFlag}</if>
+            <if test="loginFailTime != null ">and user.loginFailTime = #{loginFailTime}</if>
+            <if test="tipStatus != null  and tipStatus != ''">and user.tipStatus = #{tipStatus}</if>
+            <if test="onlineMoney != null ">and user.onlineMoney = #{onlineMoney}</if>
+            <if test="unionId != null  and unionId != ''">and user.unionId = #{unionId}</if>
+            <if test="openId != null  and openId != ''">and user.openId = #{openId}</if>
         </where>
     </delete>