From 4d276ebe6e8241dce94469dfef9e6ce75474347e Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Fri, 24 Apr 2020 14:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9B=9E=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/RetailCompanyService.java         |  2 +-
 .../PrivilageAccountController.java           | 20 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
index bdd8217..bfcf469 100644
--- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
+++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
@@ -128,7 +128,7 @@ public class RetailCompanyService {
      * 查询所有的零售公司信息
      */
     public List<PrivilageOrganizational> listOfRetailCompany(long userId,Long bigRegionId){
-        if (bigRegionId == 0L){
+        if (bigRegionId == null || bigRegionId == 0L){
             bigRegionId = null;
         }
         QueryWrapper<PrivilageOrganizationalMember> wrapper1 = new QueryWrapper<>();
diff --git a/src/main/java/com/kiisoo/ic/system/controller/PrivilageAccountController.java b/src/main/java/com/kiisoo/ic/system/controller/PrivilageAccountController.java
index d0a0197..b48bc77 100644
--- a/src/main/java/com/kiisoo/ic/system/controller/PrivilageAccountController.java
+++ b/src/main/java/com/kiisoo/ic/system/controller/PrivilageAccountController.java
@@ -82,26 +82,6 @@ public class PrivilageAccountController extends BaseController {
             return fail();
         }
 
-    }
-    /**
-     *  账号管理-保存账号
-     * @param addFrom 账号输入
-     * @return 成功0000，失败0001，已存在0002
-     */
-    @ResponseBody
-    @PostMapping("/save/code")
-    public Map<String, Object> saveAccountInputCode(@RequestParam("addFrom")String addFrom) {
-        try {
-            JSONObject saveAccountInputJSON = JSONObject.parseObject(addFrom);
-            SaveAccountInput saveAccountInput1 = saveAccountInputJSON.toJavaObject(SaveAccountInput.class);
-            boolean flag = privilageAccountService.saveAccount(saveAccountInput1);
-            //成功为0000，存在业务不能新增为0002
-            return flag ? data(success()) : data(fail());
-        } catch (Exception e) {
-            log.error("账号管理-保存账号出错", e);
-            return fail();
-        }
-
     }
 
     /**