新增公司可编辑自己公司的主备小程序

fs-company/src/main/java/com/fs/company/controller/company/CompanyConfigController.java

@@ -8,6 +8,7 @@ import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyConfig;
 import com.fs.company.param.SaveCompanyMiniAppParam;
 import com.fs.company.service.ICompanyConfigService;
+import com.fs.company.vo.CompanyMiniAppVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.system.domain.SysConfig;
@@ -17,6 +18,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 系统配置
  *
@@ -93,7 +96,9 @@ public class CompanyConfigController extends BaseController
             return R.error("用户信息错误");
         }
         Long companyId = loginUser.getCompany().getCompanyId();
-        return R.ok().put("data",companyConfigService.getCompanyMiniAppList(companyId));
+        List<CompanyMiniAppVO> companyMiniAppList = companyConfigService.getCompanyMiniAppList(companyId);
+        SaveCompanyMiniAppParam param = companyConfigService.getCurrentCompanyMiniApp(companyId);
+        return R.ok().put("data",companyMiniAppList).put("current",param);
 
     }
 

fs-service/src/main/java/com/fs/company/service/ICompanyConfigService.java

@@ -80,6 +80,7 @@ public interface ICompanyConfigService
      */
     List<CompanyMiniAppVO> getCompanyMiniAppList(Long companyId);
 
+    SaveCompanyMiniAppParam getCurrentCompanyMiniApp(Long companyId);
     /**
      * 公司编辑保存主备小程序数据
      * @param param

fs-service/src/main/java/com/fs/company/service/impl/CompanyConfigServiceImpl.java

@@ -186,10 +186,37 @@ public class CompanyConfigServiceImpl implements ICompanyConfigService
      * @param companyId
      * @return
      */
-    public  List<CompanyMiniAppVO> getCompanyMiniAppList(Long companyId){
+    public List<CompanyMiniAppVO> getCompanyMiniAppList(Long companyId){
         return companyConfigMapper.getCompanyMiniAppList(companyId);
     }
 
+    //主要小程序
+    Integer type_main = 0;
+    //备用小程序
+    Integer type_backup = 1;
+
+    @Override
+    public SaveCompanyMiniAppParam getCurrentCompanyMiniApp(Long companyId){
+        SaveCompanyMiniAppParam result = new SaveCompanyMiniAppParam();
+        CompanyMiniapp companyMiniapp = new CompanyMiniapp();
+        companyMiniapp.setCompanyId(companyId);
+        List<CompanyMiniapp> companyMiniapps = companyMiniappMapper.selectCompanyMiniappList(companyMiniapp);
+        if(null != companyMiniapps && !companyMiniapps.isEmpty() && companyMiniapps.size() == 2){
+            for (CompanyMiniapp miniapp : companyMiniapps) {
+                //主要小程序更新
+                if(type_main.equals(miniapp.getType())){
+                    result.setMainMiniAppId(miniapp.getAppId());
+                }
+                //备用小程序更新
+                if(type_backup.equals(miniapp.getType())){
+                    result.setBackupMiniAppId(miniapp.getAppId());
+                }
+            }
+        }
+
+        return result;
+    }
+
 
     /**
      * 公司编辑保存主备小程序数据
@@ -201,10 +228,6 @@ public class CompanyConfigServiceImpl implements ICompanyConfigService
     public R saveCompanyMiniApp(SaveCompanyMiniAppParam param){
         CompanyMiniapp companyMiniapp = new CompanyMiniapp();
         companyMiniapp.setCompanyId(param.getCompanyId());
-        //主要小程序
-        Integer type_main = 0;
-        //备用小程序
-        Integer type_backup = 1;
 
         List<CompanyMiniapp> companyMiniapps = companyMiniappMapper.selectCompanyMiniappList(companyMiniapp);
         if(null != companyMiniapps && !companyMiniapps.isEmpty() && companyMiniapps.size() == 2){