代码提交

 Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/feign/ISysClient.java

@@ -356,7 +356,7 @@
     * @return
     */
    @PostMapping(STRATEGYBYID)
    R<Strategy>  getByUserId(@RequestParam("id") Long userId);
    R<Strategy> getByUserId(@RequestParam("id") Long userId);

    /**
     * 根据组合方式id获取值

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java

@@ -207,6 +207,7 @@
            }
            //处理allCode
            if(!CollectionUtils.isEmpty(allCodeDOList)){
                // TODO 历史数据导入的时候这儿偶尔会触发空指针异常
                Map<String,List<CodeAllCode>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid()));
                Map<String, CodeAllCode> codeDOMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getCodeRuleOid() + "${SEP}" + s.getId(), t -> t));
                List<CodeAllCode> addCodeDOs = new ArrayList<>();

 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java

@@ -53,15 +53,12 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;

import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static com.vci.ubcs.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;