From a18b144615954b1c4727ffee3b9135ecc730bd9d Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Wed, 8 Apr 2020 17:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=9D=83=E9=99=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/PrivilageDomainDOMapper.java       |  2 ++
 .../mapper/PrivilageUserDomainDOMapper.java   |  2 ++
 .../impl/PrivilageDomainServiceImpl.java      | 30 +++++++++++--------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageDomainDOMapper.java b/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageDomainDOMapper.java
index a3b5972..537b665 100644
--- a/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageDomainDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageDomainDOMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kiisoo.ic.domain.entity.PrivilageDomainDO;
 import com.kiisoo.ic.domain.entity.PrivilageDomainEntityDO;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -12,6 +13,7 @@ import java.util.List;
  * @author jinchaofan
  * @since 2020-02-26
  */
+@Repository
 public interface PrivilageDomainDOMapper extends BaseMapper<PrivilageDomainDO> {
 
     /**
diff --git a/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageUserDomainDOMapper.java b/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageUserDomainDOMapper.java
index d209345..a73666d 100644
--- a/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageUserDomainDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/domain/mapper/PrivilageUserDomainDOMapper.java
@@ -2,12 +2,14 @@ package com.kiisoo.ic.domain.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kiisoo.ic.domain.entity.PrivilageUserDomainDO;
+import org.springframework.stereotype.Repository;
 
 /**
  * 用户域关系  Mapper 接口
  * @author jinchaofan
  * @since 2020-02-26
  */
+@Repository
 public interface PrivilageUserDomainDOMapper extends BaseMapper<PrivilageUserDomainDO> {
 
 }
diff --git a/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java b/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java
index 0703b11..564baf7 100644
--- a/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java
@@ -32,38 +32,42 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
     /**
      * 店铺 mapper
      */
-    @Autowired
-    private PoiStoreStaffDOMapper poiStoreStaffDOMapper;
+    private final PoiStoreStaffDOMapper poiStoreStaffDOMapper;
     
     /**
      * 域 mapper
      */
-    @Autowired
-    private PrivilageDomainDOMapper privilageDomainDOMapper;
+    private final PrivilageDomainDOMapper privilageDomainDOMapper;
 
     /**
      * 用户域 mapper
      */
-    @Autowired
-    private PrivilageUserDomainDOMapper privilageUserDomainDOMapper;
+    private final PrivilageUserDomainDOMapper privilageUserDomainDOMapper;
 
     /**
      * 域实体 mapper
      */
-    @Autowired
-    private PrivilageDomainEntityDOMapper privilageDomainEntityDOMapper;
+    private final PrivilageDomainEntityDOMapper privilageDomainEntityDOMapper;
 
     /**
      * 用户 service
      */
-    @Autowired
-    private PrivilageUserService privilageUserService;
+    private final PrivilageUserService privilageUserService;
 
     /**
      * 角色 mapper
      */
+    private final PrivilageRoleDOMapper privilageRoleDOMapper;
+
     @Autowired
-    private PrivilageRoleDOMapper privilageRoleDOMapper;
+    public PrivilageDomainServiceImpl(PoiStoreStaffDOMapper poiStoreStaffDOMapper, PrivilageDomainDOMapper privilageDomainDOMapper, PrivilageUserDomainDOMapper privilageUserDomainDOMapper, PrivilageDomainEntityDOMapper privilageDomainEntityDOMapper, PrivilageUserService privilageUserService, PrivilageRoleDOMapper privilageRoleDOMapper) {
+        this.poiStoreStaffDOMapper = poiStoreStaffDOMapper;
+        this.privilageDomainDOMapper = privilageDomainDOMapper;
+        this.privilageUserDomainDOMapper = privilageUserDomainDOMapper;
+        this.privilageDomainEntityDOMapper = privilageDomainEntityDOMapper;
+        this.privilageUserService = privilageUserService;
+        this.privilageRoleDOMapper = privilageRoleDOMapper;
+    }
 
     @Override
     public void saveUserDomain(long userId, long domainId) {
@@ -125,7 +129,7 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
         removeList.removeAll(shopIdList);
         addList.removeAll(entityIdList);
         //删除
-        if(removeList != null && removeList.size() > 0) {
+        if(removeList.size() > 0) {
             privilageDomainDOMapper.removeDomainEntity(removeList, domainId, DataConstants.DOMAIN_ENTITY_TYPE_SHOP);
         }
         //新增
@@ -138,7 +142,7 @@ public class PrivilageDomainServiceImpl extends ServiceImpl<PrivilageDomainDOMap
             bean.setCreateTime(new Date());
             addPrivilageDomainEntityList.add(bean);
         });
-        if(addPrivilageDomainEntityList != null && addPrivilageDomainEntityList.size() > 0) {
+        if(addPrivilageDomainEntityList.size() > 0) {
             privilageDomainDOMapper.addDomainEntity(addPrivilageDomainEntityList);
         }
         //新增用户域