Merge branch 'feature/获取用户敏感信息' into 'developer'

Feature/获取用户敏感信息

See merge request !873

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

@@ -140,7 +140,7 @@ public interface StaffMapper {
      * @author mozhu
      * @date 2022-08-03 17:36:52
      */
-    int updateActiveStatusById(@Param("staffId")String staffId, @Param("activeCode")String activeCode, @Param("activeTime")Date activeTime, 
+    int updateActiveStatusById(@Param("staffId")String staffId, @Param("activeTime")Date activeTime, 
             @Param("expireTime")Date expireTime,
             @Param("activeDoTime")Date activeDoTime, @Param("activeStatus")Integer activeStatus);
 

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

@@ -139,7 +139,7 @@ public interface StaffService {
      * @return
      * @throws
      */
-    int updateActiveStatusById(String staffId, String activeCode , Date activeTime, Date expireTime , Date activeDoTime , Integer activeStatus);
+    int updateActiveStatusById(String staffId,  Date activeTime, Date expireTime , Date activeDoTime , Integer activeStatus);
 
     void updateOpenConcatFlag(List<String> wxUserIdList,int mixFlag);
     

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

@@ -163,10 +163,10 @@ public class StaffServiceImpl implements StaffService {
     }
     
     @Override
-    public int updateActiveStatusById(String staffId, String activeCode, Date activeTime, Date expireTime,
+    public int updateActiveStatusById(String staffId,  Date activeTime, Date expireTime,
             Date activeDoTime, Integer activeStatus) {
         
-        return mapper.updateActiveStatusById(staffId, activeCode, activeTime, expireTime, activeDoTime, activeStatus) ;
+        return mapper.updateActiveStatusById(staffId, activeTime, expireTime, activeDoTime, activeStatus) ;
     }
     
     @Override

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

@@ -490,7 +490,6 @@
     <update id="updateActiveStatusById">
         update tab_haoban_staff
         set active_status = #{activeStatus},
-        	`active_code` = #{activeCode},
   			`active_time` = #{activeTime},
   			`expire_time` = #{expireTime},
     		`active_do_time` = #{activeDoTime},