Merge remote-tracking branch 'origin/master'

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -78,9 +78,15 @@ public class TDispatchInfoController {
 		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
 		YifuUser user = SecurityUtils.getUser();
 		menuUtil.setAuthSql(user, tDispatchInfo);
-		if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+		if (Common.isNotNull(tDispatchInfo.getAuthSql())) {
+			if (tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
 				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
 			}
+			if (tDispatchInfo.getAuthSql().contains("s.") || tDispatchInfo.getAuthSql().contains("f.")){
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("s.", "a."));
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("f.", "a."));
+			}
+		}
 		tDispatchInfo.setCreateBy(user.getId());
         return  new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
     }
@@ -173,9 +179,15 @@ public class TDispatchInfoController {
 		tDispatchInfo.setStatus(CommonConstants.ONE_STRING);
 		YifuUser user = SecurityUtils.getUser();
 		menuUtil.setAuthSql(user, tDispatchInfo);
-		if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+		if (Common.isNotNull(tDispatchInfo.getAuthSql())) {
+			if (tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
 				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
 			}
+			if (tDispatchInfo.getAuthSql().contains("s.") || tDispatchInfo.getAuthSql().contains("f.")){
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("s.", "a."));
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("f.", "a."));
+			}
+		}
 		tDispatchInfo.setCreateBy(user.getId());
 		return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
 	}