多小程序 修改

fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -8,6 +8,7 @@ import java.util.Date;
 import java.util.List;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.json.JSONUtil;
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.OrderUtils;
@@ -26,6 +27,7 @@ import com.fs.company.vo.CompanyVoiceCallerListVO;
 import com.fs.core.security.LoginUser;
 import com.fs.core.security.SecurityUtils;
 import com.fs.core.web.service.TokenService;
+import com.fs.store.vo.OptionsVO;
 import com.fs.system.config.SnowflakeUtils;
 import lombok.Synchronized;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -247,5 +249,16 @@ public class CompanyController extends BaseController
         return R.ok("提交成功,等待审核");
     }
 
+    @GetMapping("/allList")
+    public TableDataInfo getHospital()
+    {
+        Long deptId = null;
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
 
+        if(!loginUser.getUser().isAdmin()){
+            deptId = loginUser.getUser().getDeptId();
+        }
+        List<OptionsVO> list = companyService.selectAllCompanyList(deptId);
+        return getDataTable(list);
+    }
 }

fs-service-system/src/main/java/com/fs/company/mapper/CompanyMapper.java

@@ -6,6 +6,7 @@ import com.fs.company.domain.Company;
 import com.fs.company.param.CompanyParam;
 import com.fs.company.vo.CompanyCrmVO;
 import com.fs.company.vo.CompanyVO;
+import com.fs.store.vo.OptionsVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -122,4 +123,6 @@ public interface CompanyMapper
 
     @Select("select company_id,company_name from company where oms_code = #{omsCode}")
     List<Long> selectCompanyByOmsCode(@Param("omsCode") String omsCode);
+
+    List<OptionsVO> selectAllCompanyList(Long deptId);
 }

fs-service-system/src/main/java/com/fs/company/service/ICompanyService.java

@@ -9,6 +9,7 @@ import com.fs.company.vo.CompanyCrmVO;
 import com.fs.company.vo.CompanyVO;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsStorePayment;
+import com.fs.store.vo.OptionsVO;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -96,4 +97,6 @@ public interface ICompanyService
     List<Long> selectCompanyByOmsCode(String omsCode);
 
     Company selectCompanyByIdForUpdate(Long companyId);
+
+    List<OptionsVO> selectAllCompanyList(Long deptId);
 }

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fs.company.service.impl;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -17,6 +18,7 @@ import com.fs.store.config.StoreConfig;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsStorePayment;
 import com.fs.store.mapper.FsStoreOrderMapper;
+import com.fs.store.vo.OptionsVO;
 import com.fs.system.service.ISysConfigService;
 import com.github.pagehelper.PageHelper;
 import lombok.Synchronized;
@@ -415,4 +417,9 @@ public class CompanyServiceImpl implements ICompanyService
     public Company selectCompanyByIdForUpdate(Long companyId) {
         return companyMapper.selectCompanyByIdForUpdate(companyId);
     }
+
+    @Override
+    public List<OptionsVO> selectAllCompanyList(Long deptId) {
+        return companyMapper.selectAllCompanyList(deptId);
+    }
 }

fs-service-system/src/main/resources/mapper/company/CompanyMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCompanyVo"/>
         where company_id = #{companyId}
     </select>
+    <select id="selectAllCompanyList" resultType="com.fs.store.vo.OptionsVO"></select>
 
     <insert id="insertCompany" parameterType="Company" useGeneratedKeys="true" keyProperty="companyId">
         insert into company