企业登录

health/src/main/java/com/ccsens/health/bean/po/Employee.java

@@ -20,6 +20,10 @@ public class Employee implements Serializable {
 
     private Byte hideMobile;
 
+    private String avatar;
+
+    private String thumbAvatar;
+
     private String englishName;
 
     private Long tallUserId;
@@ -96,6 +100,22 @@ public class Employee implements Serializable {
         this.hideMobile = hideMobile;
     }
 
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar == null ? null : avatar.trim();
+    }
+
+    public String getThumbAvatar() {
+        return thumbAvatar;
+    }
+
+    public void setThumbAvatar(String thumbAvatar) {
+        this.thumbAvatar = thumbAvatar == null ? null : thumbAvatar.trim();
+    }
+
     public String getEnglishName() {
         return englishName;
     }
@@ -150,6 +170,8 @@ public class Employee implements Serializable {
         sb.append(", status=").append(status);
         sb.append(", address=").append(address);
         sb.append(", hideMobile=").append(hideMobile);
+        sb.append(", avatar=").append(avatar);
+        sb.append(", thumbAvatar=").append(thumbAvatar);
         sb.append(", englishName=").append(englishName);
         sb.append(", tallUserId=").append(tallUserId);
         sb.append(", createdAt=").append(createdAt);

health/src/main/java/com/ccsens/health/bean/po/EmployeeExample.java

@@ -625,6 +625,146 @@ public class EmployeeExample {
             return (Criteria) this;
         }
 
+        public Criteria andAvatarIsNull() {
+            addCriterion("avatar is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarIsNotNull() {
+            addCriterion("avatar is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarEqualTo(String value) {
+            addCriterion("avatar =", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotEqualTo(String value) {
+            addCriterion("avatar <>", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarGreaterThan(String value) {
+            addCriterion("avatar >", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarGreaterThanOrEqualTo(String value) {
+            addCriterion("avatar >=", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarLessThan(String value) {
+            addCriterion("avatar <", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarLessThanOrEqualTo(String value) {
+            addCriterion("avatar <=", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarLike(String value) {
+            addCriterion("avatar like", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotLike(String value) {
+            addCriterion("avatar not like", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarIn(List<String> values) {
+            addCriterion("avatar in", values, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotIn(List<String> values) {
+            addCriterion("avatar not in", values, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarBetween(String value1, String value2) {
+            addCriterion("avatar between", value1, value2, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotBetween(String value1, String value2) {
+            addCriterion("avatar not between", value1, value2, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarIsNull() {
+            addCriterion("thumb_avatar is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarIsNotNull() {
+            addCriterion("thumb_avatar is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarEqualTo(String value) {
+            addCriterion("thumb_avatar =", value, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarNotEqualTo(String value) {
+            addCriterion("thumb_avatar <>", value, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarGreaterThan(String value) {
+            addCriterion("thumb_avatar >", value, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarGreaterThanOrEqualTo(String value) {
+            addCriterion("thumb_avatar >=", value, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarLessThan(String value) {
+            addCriterion("thumb_avatar <", value, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarLessThanOrEqualTo(String value) {
+            addCriterion("thumb_avatar <=", value, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarLike(String value) {
+            addCriterion("thumb_avatar like", value, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarNotLike(String value) {
+            addCriterion("thumb_avatar not like", value, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarIn(List<String> values) {
+            addCriterion("thumb_avatar in", values, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarNotIn(List<String> values) {
+            addCriterion("thumb_avatar not in", values, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarBetween(String value1, String value2) {
+            addCriterion("thumb_avatar between", value1, value2, "thumbAvatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andThumbAvatarNotBetween(String value1, String value2) {
+            addCriterion("thumb_avatar not between", value1, value2, "thumbAvatar");
+            return (Criteria) this;
+        }
+
         public Criteria andEnglishNameIsNull() {
             addCriterion("english_name is null");
             return (Criteria) this;

health/src/main/java/com/ccsens/health/service/WeiXinService.java

@@ -198,6 +198,7 @@ public class WeiXinService implements IWeiXinService {
         params.put("department_id", department.getId());
         params.put("fetch_child", 0);
         JSONObject userResult = (JSONObject) RestTemplateUtil.getForEntity(WeiXinConstant.USER_LIST, params, JSONObject.class);
+        log.info("员工信息：{}", userResult);
         if (!WeiXinConstant.pageResult(userResult)) {
             log.error("查询员工信息异常：{},{}", params, userResult);
             return;
@@ -214,6 +215,7 @@ public class WeiXinService implements IWeiXinService {
             Employee employee = user.toJavaObject(Employee.class);
             employee.setId(snowflake.nextId());
             employee.setCorpid(corpId);
+            employee.setThumbAvatar(user.getString("thumb_avatar"));
             employees.add(employee);
             JSONArray departmentIds = user.getJSONArray("department");
             JSONArray orders = user.getJSONArray("order");

health/src/main/resources/mapper_raw/EmployeeMapper.xml

@@ -10,6 +10,8 @@
     <result column="status" jdbcType="TINYINT" property="status" />
     <result column="address" jdbcType="VARCHAR" property="address" />
     <result column="hide_mobile" jdbcType="TINYINT" property="hideMobile" />
+    <result column="avatar" jdbcType="VARCHAR" property="avatar" />
+    <result column="thumb_avatar" jdbcType="VARCHAR" property="thumbAvatar" />
     <result column="english_name" jdbcType="VARCHAR" property="englishName" />
     <result column="tall_user_id" jdbcType="BIGINT" property="tallUserId" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
@@ -75,8 +77,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, corpid, userid, name, gender, status, address, hide_mobile, english_name, tall_user_id, 
-    created_at, updated_at, rec_status
+    id, corpid, userid, name, gender, status, address, hide_mobile, avatar, thumb_avatar, 
+    english_name, tall_user_id, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.health.bean.po.EmployeeExample" resultMap="BaseResultMap">
     select
@@ -111,14 +113,16 @@
   <insert id="insert" parameterType="com.ccsens.health.bean.po.Employee">
     insert into t_employee (id, corpid, userid, 
       name, gender, status, 
-      address, hide_mobile, english_name, 
-      tall_user_id, created_at, updated_at, 
-      rec_status)
+      address, hide_mobile, avatar, 
+      thumb_avatar, english_name, tall_user_id, 
+      created_at, updated_at, rec_status
+      )
     values (#{id,jdbcType=BIGINT}, #{corpid,jdbcType=VARCHAR}, #{userid,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, 
-      #{address,jdbcType=VARCHAR}, #{hideMobile,jdbcType=TINYINT}, #{englishName,jdbcType=VARCHAR}, 
-      #{tallUserId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{recStatus,jdbcType=TINYINT})
+      #{address,jdbcType=VARCHAR}, #{hideMobile,jdbcType=TINYINT}, #{avatar,jdbcType=VARCHAR}, 
+      #{thumbAvatar,jdbcType=VARCHAR}, #{englishName,jdbcType=VARCHAR}, #{tallUserId,jdbcType=BIGINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.health.bean.po.Employee">
     insert into t_employee
@@ -147,6 +151,12 @@
       <if test="hideMobile != null">
         hide_mobile,
       </if>
+      <if test="avatar != null">
+        avatar,
+      </if>
+      <if test="thumbAvatar != null">
+        thumb_avatar,
+      </if>
       <if test="englishName != null">
         english_name,
       </if>
@@ -188,6 +198,12 @@
       <if test="hideMobile != null">
         #{hideMobile,jdbcType=TINYINT},
       </if>
+      <if test="avatar != null">
+        #{avatar,jdbcType=VARCHAR},
+      </if>
+      <if test="thumbAvatar != null">
+        #{thumbAvatar,jdbcType=VARCHAR},
+      </if>
       <if test="englishName != null">
         #{englishName,jdbcType=VARCHAR},
       </if>
@@ -238,6 +254,12 @@
       <if test="record.hideMobile != null">
         hide_mobile = #{record.hideMobile,jdbcType=TINYINT},
       </if>
+      <if test="record.avatar != null">
+        avatar = #{record.avatar,jdbcType=VARCHAR},
+      </if>
+      <if test="record.thumbAvatar != null">
+        thumb_avatar = #{record.thumbAvatar,jdbcType=VARCHAR},
+      </if>
       <if test="record.englishName != null">
         english_name = #{record.englishName,jdbcType=VARCHAR},
       </if>
@@ -268,6 +290,8 @@
       status = #{record.status,jdbcType=TINYINT},
       address = #{record.address,jdbcType=VARCHAR},
       hide_mobile = #{record.hideMobile,jdbcType=TINYINT},
+      avatar = #{record.avatar,jdbcType=VARCHAR},
+      thumb_avatar = #{record.thumbAvatar,jdbcType=VARCHAR},
       english_name = #{record.englishName,jdbcType=VARCHAR},
       tall_user_id = #{record.tallUserId,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
@@ -301,6 +325,12 @@
       <if test="hideMobile != null">
         hide_mobile = #{hideMobile,jdbcType=TINYINT},
       </if>
+      <if test="avatar != null">
+        avatar = #{avatar,jdbcType=VARCHAR},
+      </if>
+      <if test="thumbAvatar != null">
+        thumb_avatar = #{thumbAvatar,jdbcType=VARCHAR},
+      </if>
       <if test="englishName != null">
         english_name = #{englishName,jdbcType=VARCHAR},
       </if>
@@ -328,6 +358,8 @@
       status = #{status,jdbcType=TINYINT},
       address = #{address,jdbcType=VARCHAR},
       hide_mobile = #{hideMobile,jdbcType=TINYINT},
+      avatar = #{avatar,jdbcType=VARCHAR},
+      thumb_avatar = #{thumbAvatar,jdbcType=VARCHAR},
       english_name = #{englishName,jdbcType=VARCHAR},
       tall_user_id = #{tallUserId,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},

tall/src/main/java/com/ccsens/tall/service/UserService.java

@@ -479,12 +479,7 @@ public class UserService implements IUserService {
     }
 
     /**
-<<<<<<< HEAD
      * 获取企业微信信息，并绑定用户
-     *
-=======
-     * 绑定用户信息，并获取用户性别
->>>>>>> 1cb0cb3e14834bb8d60b2060c0e49a8b7615b036
      * @param identifyType
      * @param userid
      * @param corpId
@@ -492,7 +487,7 @@ public class UserService implements IUserService {
      * @param user
      */
     private void getUserDetail(byte identifyType, String userid, String corpId, String redirect, SysUser user) {
-        if (identifyType == WebConstant.IDENTIFY_TYPE.Wxmp.value) {
+        if (identifyType == WebConstant.IDENTIFY_TYPE.WxEnterprise.value && StrUtil.isNotBlank(redirect)) {
             Map<String, Object> map = new HashMap<>();
             map.put("tallUserId", user.getId());
             map.put("userid", userid);
@@ -505,6 +500,7 @@ public class UserService implements IUserService {
                 JSONObject data = json.getJSONObject("data");
                 user.setNickname(data.getString("name"));
                 user.setGender(data.getByteValue("gender"));
+                user.setAvatarUrl(data.getString("avatar"));
             }
         }
     }