Merge remote-tracking branch 'origin/developer' into developer

884bb044 · guojuxing · e4ffebf8 · cbe464aa · 884bb044
Commit 884bb044 authored Feb 26, 2020 by guojuxing
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

StoreApiServiceImpl.java ...com/gic/store/service/outer/impl/StoreApiServiceImpl.java +1 -1

No files found.
--- a/gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
+++ b/gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
@@ -355,7 +355,7 @@ public class StoreApiServiceImpl implements StoreApiService {
     * @return
     */
    private String getGroup(StoreDTO storeDTO) {
-        if (storeDTO.getIsEditStoreGroup() == 1 || Integer.valueOf(0).equals(storeStrategyApiService.getStoreGroupStrategyWeight(storeDTO.getEnterpriseId()).getResult())) {
+        if (storeDTO.getIsEditStoreGroup() == 1 && Integer.valueOf(1).equals(storeStrategyApiService.getStoreGroupStrategyWeight(storeDTO.getEnterpriseId()).getResult())) {
            // 不启用分组策略
            if (storeDTO.getStoreGroupId() == null) {
                // 取 未分类 分组