2 Achegas e29eddbf30 ... 8ade558427

Autor SHA1 Mensaxe Data
  xgb 8ade558427 Merge remote-tracking branch 'origin/master' hai 4 días
  xgb 57e9f43ff9 云联bug修改 hai 4 días

+ 0 - 4
fs-admin/src/main/java/com/fs/qw/controller/QwExternalContactController.java

@@ -93,10 +93,6 @@ public class QwExternalContactController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(QwExternalContactParam qwExternalContact)
     {
-        if (qwExternalContact.getCompanyId() == null) {
-            return AjaxResult.success();
-        }
-
         List<QwExternalContactVO> list = qwExternalContactService.selectQwExternalContactListVO(qwExternalContact);
         list.forEach(item->{
 

+ 8 - 0
fs-admin/src/main/java/com/fs/qw/controller/QwUserController.java

@@ -589,6 +589,14 @@ public class QwUserController extends BaseController {
         return  R.ok().put("data",list);
     }
 
+    @GetMapping("/getMyQwCompanyListAll")
+    public R getMyQwCompanyListAll()
+    {
+        List<QwOptionsVO> list = qwUserService.selectQwCompanyListOptionsVOAll();
+        return  R.ok().put("data",list);
+    }
+
+
     @GetMapping("/getQwCompanyList")
     public R getQwCompanyList()
     {