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

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

@@ -31,6 +31,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServlet;
@@ -170,7 +171,19 @@ public class LoginController extends WebBaseController{
 	@RequestMapping("login-out")
 	public HaobanResponse loginOut() {
 		
-		AuthRequestUtil.delSessionUser();
+		String token = "";
+		Cookie[] cookies = AuthRequestUtil.getRequest().getCookies();
+		if(cookies != null){
+			for (Cookie cookie : cookies) {
+				if(cookie.getName().equals("token")){
+					token = cookie.getValue();
+					break;
+				}
+			}
+		}
+		if(StringUtils.isNotBlank(token)){
+			RedisUtil.delCache(token);
+		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 		
 	}

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

@@ -129,6 +129,14 @@ public class StaffController extends WebBaseController{
 	
 	@RequestMapping("staff-del")
 	public HaobanResponse staffDel(String staffDepartmentStaffRelatedId){
+		StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentStaffRelatedId);
+		if(related == null){
+			return resultResponse(HaoBanErrCode.ERR_8);
+		}
+		DepartmentDTO department = departmentApiService.selectById(related.getDepartmentId());
+		if(department.getTempFlag() != null && department.getTempFlag() == 1){
+			return resultResponse(HaoBanErrCode.ERR_10014);
+		}
 		staffApiService.del(staffDepartmentStaffRelatedId);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
@@ -139,7 +147,19 @@ public class StaffController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		String[] staffArr = staffDepartmentRelatedIds.split(",");
+		int size  = staffArr.length;
 		for (String string : staffArr) {
+			StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(string);
+			if(related == null){
+				continue;
+			}
+			DepartmentDTO department = departmentApiService.selectById(related.getDepartmentId());
+			if(department.getTempFlag() != null && department.getTempFlag() == 1){
+				if(size == 1){
+					return resultResponse(HaoBanErrCode.ERR_10014);
+				}
+				continue;
+			}
 			staffApiService.del(string);
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);

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

@@ -149,7 +149,7 @@ public class WxEnterpriseController extends WebBaseController{
 		if(org.apache.commons.lang3.StringUtils.isAnyBlank(enterpriseId,version)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		int i = wxEnterpriseRelatedApiService.wxEnterpriseBind(enterpriseId,wxEnterpriseId,version);
 		if(i==1){
@@ -162,7 +162,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@IgnoreLogin
 	@RequestMapping("store-full-list")
 	public HaobanResponse storeFullList(BasePageInfo basePageInfo,String keyWord) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 //		String wxEnterpriseId = "1";
 		int maxVersionCount = 0;
@@ -221,7 +221,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@RequestMapping("is-wx-enterprise-secret-set")
 	public HaobanResponse isWxEnterpriseSecretSet() {
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(wxEnterprise != null && org.apache.commons.lang3.StringUtils.isAnyBlank(wxEnterprise.getContactSecret(),wxEnterprise.getWxSecretKey(),wxEnterprise.getMemberSecret())){
@@ -239,7 +239,7 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(wxEnterprise == null){
@@ -255,7 +255,7 @@ public class WxEnterpriseController extends WebBaseController{
 		}else{
 			wxEnterprise.setContactSecretLastTime(new Date());
 			wxEnterpriseApiService.update(wxEnterprise);
-			return resultResponse(HaoBanErrCode.ERR_1,false);
+			return resultResponse(HaoBanErrCode.ERR_10013);
 		}
  
 	}
@@ -268,7 +268,7 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(wxEnterprise == null){
@@ -279,7 +279,7 @@ public class WxEnterpriseController extends WebBaseController{
 		if(org.apache.commons.lang3.StringUtils.isBlank(res)){
 			wxEnterprise.setWxSecretKeyLastTime(new Date());
 			wxEnterpriseApiService.update(wxEnterprise);
-			return resultResponse(HaoBanErrCode.ERR_1,false);
+			return resultResponse(HaoBanErrCode.ERR_10013);
 		}else{
 			wxEnterprise.setWxSecretKey(wxSecretKey);
 			wxEnterprise.setWxSecretKeyLastTime(new Date());
@@ -297,7 +297,7 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		String wxEnterpriseId = "";
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		wxEnterpriseId = login.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(wxEnterprise == null){
@@ -312,7 +312,7 @@ public class WxEnterpriseController extends WebBaseController{
 		}else{
 			wxEnterprise.setMemberSecretLastTime(new Date());
 			wxEnterpriseApiService.update(wxEnterprise);
-			return resultResponse(HaoBanErrCode.ERR_1,false);
+			return resultResponse(HaoBanErrCode.ERR_10013);
 		}
 	}
 	

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -82,6 +82,10 @@ public enum HaoBanErrCode {
     ERR_10011(10011,"正在同步中，请等待结束再操作"),
     
     ERR_10012(10012,"企业微信不存在"),
+    
+    ERR_10013(10013,"secret设置失败，请确认"),
+    
+    ERR_10014(10014,"暂存部门人员不能删除"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");

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

@@ -294,8 +294,8 @@ public class ClerkController extends WebBaseController{
 			if(department == null){
 				return resultResponse(HaoBanErrCode.ERR_400001);
 			}
-			StaffDepartmentRelatedDTO staffRelated = staffApiService.getDepartmentIdAndCode(department.getDepartmentId(), clerkCode);
-			if(staffRelated != null){
+			//StaffDepartmentRelatedDTO staffRelated = staffApiService.getDepartmentIdAndCode(department.getDepartmentId(), clerkCode);
+			if(null != clerk && StringUtils.isNotBlank(clerk.getPhoneNumber()) && !"--".equals(clerk.getPhoneNumber())){
 				return resultResponse(HaoBanErrCode.ERR_10013);
 			}
 		}
@@ -334,6 +334,9 @@ public class ClerkController extends WebBaseController{
 			}else{
 				ClerkDTO clerk = clerkService.getClerkByClerkCode(departmentDTO.getEnterpriseId(), related.getClerkCode());
 				if(clerk != null && distributeApiService.getClerkMemberCount(departmentDTO.getEnterpriseId(), clerk.getClerkId(), storeId) == 0){
+					if(clerk.getClerkType() == 1){
+						continue;
+					}
 					syncHaobanToGicServiceApi.delGicClerk(clerk.getClerkId());
 					staffApiService.del(staffDepartmentRelatedId);
 				}