2

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -214,6 +215,16 @@ public class CommonUserController {
         return commonUserService.checkSession();
     }
 
+    /**
+     * 公司
+     *
+     * @return
+     */
+    @GetMapping("/getComp")
+    public List<CommonCompany> getComp() {
+        return commonUserService.getComp();
+    }
+
     /**
      * 次要职务
      *

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICommonUserService.java

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.winsea.svc.base.base.entity.CommonCompany;
 import com.winsea.svc.base.base.entity.CommonStaffRole;
 import com.winsea.svc.base.security.entity.Account;
 import com.winsea.svc.notice.entity.NoticeTaskInfo;
@@ -8,6 +9,8 @@ import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
 import com.baomidou.mybatisplus.service.IService;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -81,4 +84,6 @@ public interface ICommonUserService extends IService<CommonUser> {
     String checkSession() throws ServiceException;
 
     String saveRole(CommonStaffRole commonStaffRole);
+
+    List<CommonCompany> getComp();
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -273,6 +273,18 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         return "ok";
     }
 
+
+    /**
+     * 修改用户信息
+     *
+     * @return
+     */
+    @Override
+    public List<CommonCompany> getComp()  {
+        return commonCompanyService.selectList(new EntityWrapper<CommonCompany>().eq("delete_flag","0"));
+    }
+
+
     /**
      * 发送验证码
      *