修改查询未绑定企微userId的信息采集列表接口

fs-company/src/main/java/com/fs/hisStore/controller/FsUserInformationCollectionController.java

@@ -102,8 +102,8 @@ public class FsUserInformationCollectionController extends BaseController
     /**
      * 新增简化版用户信息采集(临时无userId)
      */
-    @Log(title = "新增简化版用户信息采集(临时无userId)", businessType = BusinessType.UPDATE)
-    @PutMapping("/createSimpleUserInfo")
+    @Log(title = "新增简化版用户信息采集(临时无userId)", businessType = BusinessType.INSERT)
+    @PostMapping("/createSimpleUserInfo")
     public AjaxResult createSimpleUserInfo(@RequestBody FsUserInformationCollectionParam fsUserInformationCollection)
     {
         LoginUser loginUser = SecurityUtils.getLoginUser();

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -1371,38 +1371,21 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
      * 辅助方法:组装信息采集对象
      * */
     private FsUserInformationCollection buildUserInfoCollection(FsUserInformationCollectionParam param) {
+        logger.info("组装FsUserInformationCollection入参companyUserId：{},source:{},fillFlag:{}", param.getCompanyUserId(),param.getSource(),param.getFillFlag());
         FsUserInformationCollection fsUserInformationCollection = new FsUserInformationCollection();
 
-        // 处理 answers 的 flag
-        int fillFlag=0;
         if (!CollectionUtils.isEmpty(param.getAnswers())) {
             param.getAnswers().forEach(answer -> {
                 if (answer.getFlag() == null) {
                     answer.setFlag(false);
                 }
             });
-
-            // 只要有一个 answer 的 value 有值，就设置为已填
-            boolean hasValue = param.getAnswers().stream()
-                    .anyMatch(answer -> !CollectionUtils.isEmpty(answer.getValue()));
-            boolean salesProxyFill = getSalesProxyFillConfig();//销售代理填写标识符
-            String source = param.getSource();//渠道来源
-            if (StringUtils.isNotBlank(source)){
-                //pc端填写
-                if (salesProxyFill&&hasValue){
-                    fillFlag = 1;
-                }
-            }else {
-                //小程序端
-                if ((!salesProxyFill)&&hasValue) {
-                    fillFlag = 1;
-                }
-            }
-
         }
 
-        // 所有基础属性赋值
-        fsUserInformationCollection.setFillFlag(fillFlag);
+        if (StringUtils.isNotBlank(param.getSource())&&param.getSource().equals("pc")) {
+            // pc端特殊处理
+            fsUserInformationCollection.setFillFlag(param.getFillFlag());
+        }
         fsUserInformationCollection.setJsonInfo(JSON.toJSONString(param.getAnswers()));
         fsUserInformationCollection.setUserId(param.getUserId());
         fsUserInformationCollection.setCompanyUserId(param.getCompanyUserId());