Browse Source

1、发送邮件BUG修复
2、部门列表新增后未显示BUG修复
3、新增转交客户时转交资料

anderx 4 years ago
parent
commit
bbc5e65ebc

+ 13 - 8
.idea/workspace.xml

@@ -9,13 +9,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、转交客户修改">
+    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、新增转交客户时转交资料">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/utils/AsyncUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/utils/AsyncUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/CustomerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/CustomerService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapperExt.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapperExt.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java" afterDir="false" />
     </list>
     <list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -239,7 +236,7 @@
       <workItem from="1630656901862" duration="33000" />
       <workItem from="1630888067668" duration="852000" />
       <workItem from="1630893291690" duration="11740000" />
-      <workItem from="1630976664603" duration="13132000" />
+      <workItem from="1630976664603" duration="13762000" />
     </task>
     <task id="LOCAL-00001" summary="修改客户跟进列表">
       <created>1630486551669</created>
@@ -374,7 +371,14 @@
       <option name="project" value="LOCAL" />
       <updated>1631000882566</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、新增转交客户时转交资料">
+      <created>1631003103084</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1631003103084</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -413,7 +417,8 @@
     <MESSAGE value="configpudate" />
     <MESSAGE value="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复" />
     <MESSAGE value="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、转交客户修改" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、转交客户修改" />
+    <MESSAGE value="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、新增转交客户时转交资料" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、新增转交客户时转交资料" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
   </component>
   <component name="XDebuggerManager">

+ 3 - 8
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1309,16 +1309,14 @@
 		left join industry_category c on b.industry = c.id
 		left join admin d on a.aid = d.id
 		LEFT JOIN department dm on dm.id = d.department_id
-		where a.type = 1 and a.status != 1 and a.audit_status = 1
+		where a.type = 1 and a.status != 1 and a.audit_status = 1 and a.share_type in (0,2,3)
 		<if test="aid != null and aid !=''">
 			and (a.aid = #{aid,jdbcType=VARCHAR} or d.department_id=(select department_id from admin where id=#{aid,jdbcType=VARCHAR}))
 		</if>
 		<if test="name != null and name != ''">
 			and a.nickname like concat('%',#{name},'%')
 		</if>
-		<if test="shareType != null">
-			and a.share_type = #{shareType,jdbcType=VARCHAR}
-		</if>
+
 		<if test="status != null">
 			and a.status = #{status,jdbcType=INTEGER}
 		</if>
@@ -1351,16 +1349,13 @@
 		from user a inner join organization_identity b on a.id = b.uid
 		left join admin d on a.aid = d.id
 		LEFT JOIN department dm on dm.id = d.department_id
-		where a.type = 1 and a.status != 1 and a.audit_status = 1
+		where a.type = 1 and a.status != 1 and a.audit_status = 1 and a.share_type in (0,2,3)
 		<if test="aid != null and aid !=''">
 			and (a.aid = #{aid,jdbcType=VARCHAR} or d.department_id=(select department_id from admin where id=#{aid,jdbcType=VARCHAR}))
 		</if>
 		<if test="name != null and name != ''">
 			and a.nickname like concat('%',#{name},'%')
 		</if>
-		<if test="shareType != null">
-			and a.share_type = #{shareType,jdbcType=VARCHAR}
-		</if>
 		<if test="status != null">
 			and a.status = #{status,jdbcType=INTEGER}
 		</if>

+ 0 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -246,8 +246,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		Map<String, Object> params = new HashMap<String, Object>();
 		if (StringUtils.isNotBlank(cli.getType()))
 			params.put("type", Integer.parseInt(cli.getType()));
-		if (StringUtils.isNotBlank(cli.getShareType()))
-			params.put("shareType", Integer.parseInt(cli.getShareType()));
 		if (StringUtils.isNotBlank(cli.getName()))
 			params.put("name", cli.getName());
 		if (StringUtils.isNotBlank(cli.getProvince()))