Merge remote-tracking branch 'origin/developer' into developer

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

@@ -79,7 +79,7 @@ public class StaffServiceImpl implements StaffService {
         if (null == staff && null != wxOpenUserId && !wxUserId.equals(wxOpenUserId)) {
             return  this.mapper.selectByUserIdAndEnterpriseId(wxOpenUserId, wxEnterpriseId) ;
         }
-        return null;
+        return staff;
     }
 
     @Override

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

@@ -107,11 +107,11 @@
         group by department_id
     </select>
 
-    <update id="delByUserid">
+    <update id="delByStaffid">
         update tab_haoban_staff_department_related
         set status_flag = 0,
             update_time = now()
-        where wx_user_id = #{userid,jdbcType=VARCHAR}
+        where staff_id = #{staffId,jdbcType=VARCHAR}
     </update>