Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/YwWxEnterpriseDTO.java

@@ -25,8 +25,19 @@ public class YwWxEnterpriseDTO implements Serializable {
     //版本号
     private String version;
 
+    private String corpSquareLogoUrl;
+
+    
     private static final long serialVersionUID = 1L;
 
+	public String getCorpSquareLogoUrl() {
+		return corpSquareLogoUrl;
+	}
+
+	public void setCorpSquareLogoUrl(String corpSquareLogoUrl) {
+		this.corpSquareLogoUrl = corpSquareLogoUrl;
+	}
+
 	public String getWxEnterpriseId() {
 		return wxEnterpriseId;
 	}

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

@@ -93,12 +93,12 @@ public class ClerkController extends WebBaseController{
 	}
 	//成员换绑定
 	@RequestMapping("/clerk-unbind")
-	public HaobanResponse clerkUnbind(String fromClerkCode,String toClerkCode) {
+	public HaobanResponse clerkUnbind(String departmentId,String fromClerkCode,String toClerkCode) {
 		if(StringUtils.isAnyBlank(fromClerkCode,toClerkCode)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		//将别人clerkCode置空
-		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(toClerkCode);
+		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(toClerkCode,departmentId);
 		if(one != null){
 			//存在，则先置空
 			one.setClerkCode(null);
@@ -106,11 +106,10 @@ public class ClerkController extends WebBaseController{
 			staffDepartmentRelatedApiService.deleteCode(one);
 		}
 		//将别人的clerkCode换到自己上面
-		StaffDepartmentRelatedDTO two = staffDepartmentRelatedApiService.getOneByClerkCode(fromClerkCode);
+		StaffDepartmentRelatedDTO two = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
 		if(two != null){
 			//存在，则先置空
 			two.setClerkCode(toClerkCode);
-			two.setClerkCode(toClerkCode);
 			two.setUpdateTime(new Date());
 			staffDepartmentRelatedApiService.updateById(two);
 		}

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

@@ -156,12 +156,12 @@ public class ClerkController extends WebBaseController{
 	}
 	//成员解除绑定
 	@RequestMapping("/clerk-single-unbind")
-	public HaobanResponse clerkSingleUnbind(String fromClerkCode) {
+	public HaobanResponse clerkSingleUnbind(String fromClerkCode,String departmentId) {
 		if(StringUtils.isAnyBlank(fromClerkCode)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		//将自己的clerkCode置空
-		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(fromClerkCode);
+		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode, departmentId);
 		if(one != null){
 			//存在，则先置空
 			one.setClerkCode(null);
@@ -172,12 +172,12 @@ public class ClerkController extends WebBaseController{
 	}
 	//成员换绑定
 	@RequestMapping("/clerk-unbind")
-	public HaobanResponse clerkUnbind(String fromClerkCode,String toClerkCode) {
+	public HaobanResponse clerkUnbind(String departmentId,String fromClerkCode,String toClerkCode) {
 		if(StringUtils.isAnyBlank(fromClerkCode,toClerkCode)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		//将别人clerkCode置空
-		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(toClerkCode);
+		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(toClerkCode,departmentId);
 		if(one != null){
 			//存在，则先置空
 			one.setClerkCode(null);
@@ -185,11 +185,10 @@ public class ClerkController extends WebBaseController{
 			staffDepartmentRelatedApiService.deleteCode(one);
 		}
 		//将别人的clerkCode换到自己上面
-		StaffDepartmentRelatedDTO two = staffDepartmentRelatedApiService.getOneByClerkCode(fromClerkCode);
+		StaffDepartmentRelatedDTO two = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
 		if(two != null){
 			//存在，则先置空
 			two.setClerkCode(toClerkCode);
-			two.setClerkCode(toClerkCode);
 			two.setUpdateTime(new Date());
 			staffDepartmentRelatedApiService.updateById(two);
 		}
@@ -197,11 +196,11 @@ public class ClerkController extends WebBaseController{
 	}
 	//店长转让
 	@RequestMapping("/clerk-manager-tranfer")
-	public HaobanResponse clerkManagerTranfer(String fromClerkCode,String toStaffDepartmentRelatedId) {
+	public HaobanResponse clerkManagerTranfer(String departmentId,String fromClerkCode,String toStaffDepartmentRelatedId) {
 		if(StringUtils.isAnyBlank(fromClerkCode,toStaffDepartmentRelatedId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(fromClerkCode);
+		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
 		if(one != null){
 			//存在，则先置空
 			one.setClerkCode(null);