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

@@ -6,7 +6,7 @@
             resultType="com.glxp.api.entity.auth.AuthAdmin">
         SELECT auth_user.*, auth_dept.name deptName
         FROM auth_user
-                 left join auth_dept on auth_user.locDeptCode = auth_dept.code
+                     left join auth_dept on auth_user.locDeptCode = auth_dept.code
         <where>
             <if test="ids != null and ids.size > 0">
                 AND id IN
@@ -20,14 +20,17 @@
             <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>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
                 and DATE_FORMAT(lastModifyTime
-                  , '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}
-                  , '%Y-%m-%d %H:%i:%S')
+                            , '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}
+                            , '%Y-%m-%d %H:%i:%S')
                 ]]>
             </if>
             <if test="deptCode != null and deptCode != ''">
@@ -66,10 +69,10 @@
     </select>
 
     <insert id="insertAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin">
-        INSERT INTO auth_user( id,userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag
+        INSERT INTO auth_user( id, userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag
                              , employeeName, CustomerId, lastModifyTime, locDeptCode, locInvCode, comments)
-        values
-        (#{id}, #{userName},
+                values
+                (#{id}, #{userName},
         <choose>
             <when test="passWord != null">
                 #{passWord},
@@ -107,23 +110,22 @@
 
     <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)
-        values (
-        #{id},
-        #{userName},
-        #{passWord},
-        #{lastLoginIp},
-        #{lastLoginTime},
-        #{createTime},
-        #{userFlag,jdbcType=INTEGER},
-        #{lastModifyTime},
-        #{employeeName},
-        #{CustomerId},
-        #{locDeptCode},
-        #{locInvCode},
-        #{comments}
-        )
+                INTO auth_user(id, userName, passWord, lastLoginIp,
+                               lastLoginTime, createTime, userFlag, lastModifyTime, employeeName, CustomerId,
+                               locDeptCode, locInvCode, comments)
+        values (#{id},
+                #{userName},
+                #{passWord},
+                #{lastLoginIp},
+                #{lastLoginTime},
+                #{createTime},
+                #{userFlag,jdbcType=INTEGER},
+                #{lastModifyTime},
+                #{employeeName},
+                #{CustomerId},
+                #{locDeptCode},
+                #{locInvCode},
+                #{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=")">
@@ -200,8 +202,8 @@
             resultType="com.glxp.api.entity.auth.AuthAdmin">
         select u.*
         from auth_user u
-                 left join auth_user_role sur on u.id = sur.user_id
-                 left join auth_role r on r.role_id = sur.role_id
+                     left join auth_user_role sur on u.id = sur.user_id
+                     left join auth_role r on r.role_id = sur.role_id
         <where>
             <if test="roleId != null and '' != roleId">
                 AND r.role_id = #{roleId}
@@ -214,8 +216,8 @@
             resultType="com.glxp.api.entity.auth.AuthAdmin">
         select u.*
         from auth_user u
-                 left join auth_user_role sur on u.id = sur.user_id
-                 left join auth_role r on r.role_id = sur.role_id
+                     left join auth_user_role sur on u.id = sur.user_id
+                     left join auth_role r on r.role_id = sur.role_id
         <where>
             <if test="ids != null and ids.size() != 0">
                 u.id not in

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
-        where user_company_online.companyId = #{companyId}
+                     left join user_company_online uco on uco.companyId = ucc.companyId
+        where ucc.companyId = #{companyId}
     </select>
 </mapper>