Merge branch 'developer' into 'master'

Developer

See merge request haoban3.0/haoban-manage3.0!54

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

@@ -9,6 +9,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
@@ -1178,7 +1179,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 	}
 
 	@Override
-    @RedisCache(value = "qrcode-${clerkCode}-${storeId}", timeOut = 10)
+    @RedisCache(value = "qrcode-${clerkCode}-${storeId}", timeOut = 1, timeunit = TimeUnit.DAYS)
     public ServiceResponse<String> getStaffQrcode(String clerkCode, String storeId) {
 		ServiceResponse<String> resp = new ServiceResponse<>();
 		TabHaobanDepartment department = departmentService.selectByRelatedId(storeId);
@@ -1194,7 +1195,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 			return resp;
 		}
 		for (TabHaobanStaffDepartmentRelated tab : retList) {
-			if (tab.getClerkCode().equals(clerkCode)) {
+            if (clerkCode.equals(tab.getClerkCode())) {
                 WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(department.getWxEnterpriseId());
 				UserDTO user = qywxUserApiService.getSelfWorkWxUser(wxEnterpriseDTO.getCorpid(), wxEnterpriseDTO.getContactSecret(), tab.getWxUserId());
 				if (user != null) {