Merge branch 'master' of http://git.zonelife.cn:3000/huangyang/national-motion-backend

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSitePlaceServiceImpl.java

@@ -9,9 +9,11 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.system.app.dto.*;
+import org.jeecg.modules.system.app.entity.AppSite;
 import org.jeecg.modules.system.app.entity.AppSitePlace;
 import org.jeecg.modules.system.app.entity.AppSitePriceRules;
 import org.jeecg.modules.system.app.enums.SitePlaceTypeEnum;
+import org.jeecg.modules.system.app.mapper.AppSiteMapper;
 import org.jeecg.modules.system.app.mapper.AppSitePlaceMapper;
 import org.jeecg.modules.system.app.mapper.AppSitePriceRulesMapper;
 import org.jeecg.modules.system.app.service.IAppSitePlaceService;
@@ -37,6 +39,8 @@ import static org.jeecg.common.constant.CommonConstant.SC_INTERNAL_SERVER_ERROR_
 public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, AppSitePlace> implements IAppSitePlaceService {
     @Resource
     private AppSitePriceRulesMapper appSitePriceRulesMapper;
+    @Resource
+    private AppSiteMapper appSiteMapper;
 
     //学校 包场 一对多
 
@@ -44,12 +48,13 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
     @Transactional(rollbackFor = Exception.class)
     public Boolean saveWitchPriceRules(AppSitePlaceDTO placeDTO) {
         AppSitePlaceCuDTO appSitePlaceCuDTO = placeDTO.getAppSitePlaceCuDTO();
+        AppSite appSite = appSiteMapper.selectById(appSitePlaceCuDTO.getSiteId());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if (null == appSitePlaceCuDTO.getSiteId())
             throw new JeecgBootException("商户补充信息id不能为空", SC_INTERNAL_SERVER_ERROR_500);
         AppSitePlace appSitePlace = new AppSitePlace();
         BeanUtils.copyProperties(appSitePlaceCuDTO, appSitePlace);
-        appSitePlace.setOrgCode(sysUser.getOrgCode());
+        appSitePlace.setOrgCode(appSite.getOrgCode());
         appSitePlace.setTenantId(sysUser.getOrgId());
         appSitePlace.setSiteId(appSitePlaceCuDTO.getSiteId());
         int insert = baseMapper.insert(appSitePlace);