Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java

@@ -19,6 +19,7 @@ public class FilterAuthUserRequest extends ListPageRequest {
     private List<Long> ids;
 
     private String lastUpdateTime;
+    private String employeeName;
 
     //用户名 !=
     private String neUserName;

src/main/java/com/glxp/api/req/sup/UserCompanyConfigRequest.java

@@ -10,9 +10,6 @@ import lombok.Data;
 @Data
 public class UserCompanyConfigRequest {
 
-    @ApiModelProperty(value = "id")
-    private Integer id;
-
     /**
      * 企业ID
      */

src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -20,6 +20,9 @@
             <if test="userName != null and '' != userName">
                 AND userName LIKE CONCAT('%', #{userName}, '%')
             </if>
+            <if test="employeeName != null and '' != employeeName">
+                AND employeeName LIKE CONCAT('%', #{employeeName}, '%')
+            </if>
             <if test="neUserName != null and '' != neUserName">
                 AND userName != #{neUserName}
             </if>
@@ -108,9 +111,9 @@
     <insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin">
         replace
                 INTO auth_user(id, userName, passWord, lastLoginIp,
-                              lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locDeptCode,locInvCode,comments)
+                               lastLoginTime, createTime, userFlag, lastModifyTime, employeeName, CustomerId,
-        values (
+                               locDeptCode, locInvCode, comments)
-        #{id},
+        values (#{id},
                 #{userName},
                 #{passWord},
                 #{lastLoginIp},
@@ -122,8 +125,7 @@
                 #{CustomerId},
                 #{locDeptCode},
                 #{locInvCode},
-        #{comments}
+                #{comments})
-        )
     </insert>
 
 
@@ -178,14 +180,14 @@
 
     <select id="selectNotSelectUser" resultType="com.glxp.api.entity.auth.AuthAdmin">
         select *
-        from auth_user left join auth_dept_user on auth_user.id=auth_dept_user.userId
+        from auth_user
+                     left join auth_dept_user on auth_user.id = auth_dept_user.userId
         <where>
             userFlag != 0
             <if test="deptId != null and '' != deptId">
                 AND auth_dept_user.deptId = #{deptId}
             </if>
             <if test="userIds != null and userIds.size() != 0">
-
                 and auth_user.id not in
 
                 <foreach collection="userIds" item="item" open="(" separator="," close=")">

src/main/resources/mybatis/mapper/sup/UserCompanyOnlineMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.glxp.api.dao.sup.UserCompanyOnlineMapper">
     <select id="findOnLineByConfig"
             resultType="com.glxp.api.res.sup.UserCompanyOnlineResponse">
-        SELECT user_company_online.*, ucc.heartRate, ucc.remark
+        SELECT uco.userId, uco.lastIp, uco.updateTime, ucc.heartRate, ucc.remark
         FROM user_company_config ucc
-                     left join user_company_online on user_company_online.companyId = ucc.companyId
+                     left join user_company_online uco on uco.companyId = ucc.companyId
-        where user_company_online.companyId = #{companyId}
+        where ucc.companyId = #{companyId}
     </select>
 </mapper>