fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/CustomController.java

@@ -7,10 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.*;
-import com.management.platform.mapper.ClueMapper;
-import com.management.platform.mapper.CustomMapper;
-import com.management.platform.mapper.SysFormMapper;
-import com.management.platform.mapper.UserMapper;
+import com.management.platform.mapper.*;
 import com.management.platform.service.ContactsService;
 import com.management.platform.service.CustomService;
 import com.management.platform.service.WxCorpInfoService;
@@ -48,10 +45,11 @@ public class CustomController {
     @Autowired
     private CustomMapper customMapper;
     @Autowired
-    private ClueMapper clueMapper;
-    @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private SysDictMapper sysDictMapper;
+
     @Resource
     private ExcelExportServiceImpl excelExportService;
     @Resource
@@ -146,6 +144,13 @@ public class CustomController {
                                     value = String.valueOf(aClass.getMethod("getInchargerName").invoke(bo1));
                                 }
                             }
+                            if(model.equals("customSourceValue")){
+                                if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                                    value = "$userName"+String.valueOf(aClass.getMethod("getCustomSourceValue").invoke(bo1))+"$";
+                                }else {
+                                    value = String.valueOf(aClass.getMethod("getCustomSourceValue").invoke(bo1)).equals("null") ?"" :String.valueOf(aClass.getMethod("getCustomSourceValue").invoke(bo1));
+                                }
+                            }
                             item.add(value);
                         }
                     }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/BusinessOpportunityServiceImpl.java

@@ -276,7 +276,7 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
         return msg;
     }
 
-    @Value(value = "${upload.file}")
+    @Value(value = "${upload.path}")
     private String filePath;
 
     @Override
@@ -337,7 +337,7 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
                 e.printStackTrace();
                 // 文件上传失败的响应消息
                 HttpRespMsg msg = new HttpRespMsg();
-                msg.setError("上传成功失败");
+                msg.setError("上传失败");
                 return msg;
             }
         } else {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueServiceImpl.java

@@ -161,7 +161,7 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         clueMapper.update(clue, updateWrapper);
     }
 
-    @Value(value = "${upload.file}")
+    @Value(value = "${upload.path}")
     private String path;
 
     @Override

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/CustomMapper.xml

@@ -108,7 +108,9 @@
                 c.id DESC
             </otherwise>
         </choose>
+        <if test="pageFrom != null ">
         Limit #{pageIndex},#{pageFrom}
+        </if>
     </select>
     <select id="getTotal" resultType="java.lang.Integer">
         select count(id)
@@ -208,7 +210,9 @@
                 c.id DESC
             </otherwise>
         </choose>
-        Limit #{pageIndex},#{pageFrom}
+        <if test="pageFrom != null ">
+            Limit #{pageIndex},#{pageFrom}
+        </if>
     </select>
     <select id="getTotal1" resultType="java.lang.Integer">
         select count(id)
@@ -295,7 +299,9 @@
             and customer_industry_id = #{customerIndustryId}
         </if>
         ORDER BY id desc
-        Limit #{pageIndex},#{pageFrom}
+        <if test="pageFrom != null ">
+            Limit #{pageIndex},#{pageFrom}
+        </if>
     </select>
     <select id="getTotal2" resultType="java.lang.Integer">
         select count(id)