fix：登录游客修改

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -158,6 +158,17 @@ public interface StaffApiService {
 
 
     /**
+     * 让员工隐私员工id
+     *
+     * @param userId 用户id
+     * @return {@link StaffPrivacyUseLogDTO }
+     * @author mozhu
+     * @date 2022-04-14 14:31:39
+     */
+    StaffPrivacyUseLogDTO getStaffPrivacyByUserId(String userId);
+
+
+    /**
      * 用户id wx企业id列表
      *
      * @param wxEnterpriseId wx企业标识

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffPrivacyUseLogMapper.java

@@ -33,7 +33,7 @@ public interface StaffPrivacyUseLogMapper {
     int update(TabStaffPrivacyUseLog tabStaffPrivacyUseLog);
 
     /**
-     * 查询
+     * 通过员工id查询
      *
      * @param staffId 员工id
      * @return {@link List<TabStaffPrivacyUseLog> }
@@ -42,4 +42,15 @@ public interface StaffPrivacyUseLogMapper {
      */
     TabStaffPrivacyUseLog getByStaffId(@Param("staffId") String staffId);
 
+
+    /**
+     * 通过用户id查询数据
+     *
+     * @param userId 用户id
+     * @return {@link TabStaffPrivacyUseLog }
+     * @author mozhu
+     * @date 2022-04-14 14:29:24
+     */
+    TabStaffPrivacyUseLog getByUserId(@Param("userId") String userId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffPrivacyUseLogService.java

@@ -39,4 +39,15 @@ public interface StaffPrivacyUseLogService {
      * @date 2021-12-15 10:51:32
      */
     StaffPrivacyUseLogBO getByStaffId(String staffId);
+
+
+    /**
+     * 通过用户id
+     *
+     * @param userId 用户id
+     * @return {@link StaffPrivacyUseLogBO }
+     * @author mozhu
+     * @date 2022-04-14 14:30:30
+     */
+    StaffPrivacyUseLogBO getByUserId(String userId);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffPrivacyUseLogServiceImpl.java

@@ -46,4 +46,10 @@ public class StaffPrivacyUseLogServiceImpl implements StaffPrivacyUseLogService
         TabStaffPrivacyUseLog tabStaffPrivacyUseLog = staffPrivacyUseLogMapper.getByStaffId(staffId);
         return EntityUtil.changeEntityByOrika(StaffPrivacyUseLogBO.class, tabStaffPrivacyUseLog);
     }
+
+    @Override
+    public StaffPrivacyUseLogBO getByUserId(String userId) {
+        TabStaffPrivacyUseLog tabStaffPrivacyUseLog = staffPrivacyUseLogMapper.getByUserId(userId);
+        return EntityUtil.changeEntityByOrika(StaffPrivacyUseLogBO.class, tabStaffPrivacyUseLog);
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -1181,6 +1181,11 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
+    public StaffPrivacyUseLogDTO getStaffPrivacyByUserId(String userId) {
+        return EntityUtil.changeEntity(StaffPrivacyUseLogDTO.class, staffPrivacyUseLogService.getByUserId(userId));
+    }
+
+    @Override
     public Page<StaffDTO> listUserIdByWxEnterpriseId(String wxEnterpriseId, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<TabHaobanStaff> tabHaobanStaffs = staffMapper.listUserIdByWxEnterpriseId(wxEnterpriseId);

haoban-manage3-service/src/main/resources/mapper/StaffPrivacyUseLogMapper.xml

@@ -145,4 +145,11 @@
         WHERE staff_id = #{staffId} order by create_time desc limit 1
     </select>
 
+    <select id="getByUserId" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM tab_staff_privacy_use_log
+        WHERE wx_open_user_id = #{userId} order by create_time desc limit 1
+    </select>
+
 </mapper>
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -126,8 +126,13 @@ public class WxEnterpriseInfoController extends WebBaseController {
                 loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId());
             }
         }
+
         if (loginStaff == null) {
-            return resultResponse(HaoBanErrCode.ERR_600001);
+            WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
+            wellDoneLoginInfoVo.setWxOpenUseId(userId);
+            StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);
+            wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
+            return resultResponse(HaoBanErrCode.ERR_1,wellDoneLoginInfoVo);
         }
 
         if (StringUtils.isNotBlank(loginStaff.getPhoneNumber())) {
@@ -171,11 +176,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
         wellDoneLoginInfoVo.setPhoneNumber(loginStaff.getPhoneNumber());
         wellDoneLoginInfoVo.setNationcode(loginStaff.getNationCode());
         wellDoneLoginInfoVo.setWxUserId(loginStaff.getWxUserId());
-        wellDoneLoginInfoVo.setPrivacyUseFlag(1);
-        //StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByStaffId(staffId);
-        //if (staffPrivacyUseLogDTO != null) {
-        //    wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO.getPrivacyUseFlag());
-        //}
+        StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByStaffId(staffId);
+        wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
         return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/WellDoneLoginInfoVO.java

@@ -17,6 +17,10 @@ public class WellDoneLoginInfoVO implements Serializable {
 	private String nationcode;
 	private String wxUserId;
 	private Integer privacyUseFlag;
+	/**
+	 * 第三方用户id（好办）
+	 */
+	private String wxOpenUseId;
 
 	public String getWxUserId() {
 		return wxUserId;
@@ -73,4 +77,12 @@ public class WellDoneLoginInfoVO implements Serializable {
 	public void setPrivacyUseFlag(Integer privacyUseFlag) {
 		this.privacyUseFlag = privacyUseFlag;
 	}
+
+	public String getWxOpenUseId() {
+		return wxOpenUseId;
+	}
+
+	public void setWxOpenUseId(String wxOpenUseId) {
+		this.wxOpenUseId = wxOpenUseId;
+	}
 }