Mechrevo před 2 roky
rodič
revize
b289b75c98

+ 2 - 0
sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterfaceFallback.java

@@ -7,11 +7,13 @@ import com.pj.api.dto.PeopleDto;
 import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * @Author Mechrevo
  * @Date 2023 08 01 10 32
  **/
+@Component
 public class LevelOneServerInterfaceFallback implements FallbackFactory<LevelOneServerInterface> {
 
     private static final Logger log = LoggerFactory.getLogger(AdminInterfaceFallback.class);

+ 2 - 0
sp-core/sp-api/src/main/java/com/pj/api/client/level_two_server/LevelTwoServerInterfaceFallback.java

@@ -5,11 +5,13 @@ import com.pj.api.dto.PurchaserDto;
 import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * @Author Mechrevo
  * @Date 2023 08 01 10 39
  **/
+@Component
 public class LevelTwoServerInterfaceFallback implements FallbackFactory<LevelTwoServerInterface> {
 
     private static final Logger log = LoggerFactory.getLogger(AdminInterfaceFallback.class);

+ 1 - 1
sp-core/sp-base/src/main/java/com/pj/current/dto/APPLoginUserInfo.java

@@ -11,6 +11,6 @@ import java.util.List;
 public class APPLoginUserInfo implements Serializable {
     private Long loginId;
     private String loginName;
-//    private List<String> permissions;
+    private String fk;
     private String userType;
 }

+ 1 - 1
sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersService.java

@@ -73,7 +73,7 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
 		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
 			throw new ServiceException("当前登陆用户信息已失效!");
-		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(appLoginInfo.getLoginId());
+		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(appLoginInfo.getFk());
 		if(tbPurchaser == null)throw new ServiceException("您的身份不是收购商!");
 		//执行查询
 		so.set("create_by",appLoginInfo.getLoginId()); // 订单创建人为收购商

+ 1 - 1
sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -203,7 +203,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		APPLoginUserInfo info=new APPLoginUserInfo();
 		info.setLoginId(appUser.getId());
 		info.setLoginName(appUser.getName());
-//		info.setPermissions(per_list);
+		info.setFk(appUser.getFkId());
 		info.setUserType(appUser.getUserType());
 		StpAPPUserUtil.cacheAPPLoginInfo(info);
 		return AjaxJson.getSuccessData(map);