anderx лет назад: 4
Родитель
Сommit
9426174b2b

+ 13 - 16
.idea/workspace.xml

@@ -10,10 +10,10 @@
   </component>
   </component>
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="客户资料维护修改">
     <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="客户资料维护修改">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/kede_server_war.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/kede_server_war_exploded.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/kede_server_war_exploded.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <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/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/props/config_local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/props/config_local.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/props/config_test.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/props/config_test.properties" afterDir="false" />
     </list>
     </list>
     <list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
     <list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
@@ -91,17 +91,6 @@
     </key>
     </key>
   </component>
   </component>
   <component name="RunManager">
   <component name="RunManager">
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="Tomcat 8.5.59" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.59" ALTERNATIVE_JRE_ENABLED="false" nameIsGenerated="true">
     <configuration name="Tomcat 8.5.59" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.59" ALTERNATIVE_JRE_ENABLED="false" nameIsGenerated="true">
       <option name="OPEN_IN_BROWSER" value="false" />
       <option name="OPEN_IN_BROWSER" value="false" />
       <option name="COMMON_VM_ARGUMENTS" value="-Dprofiles.activation=&quot;local&quot; -Djdbc.worker.id=&quot;1001&quot;" />
       <option name="COMMON_VM_ARGUMENTS" value="-Dprofiles.activation=&quot;local&quot; -Djdbc.worker.id=&quot;1001&quot;" />
@@ -234,7 +223,8 @@
       <workItem from="1630656368650" duration="64000" />
       <workItem from="1630656368650" duration="64000" />
       <workItem from="1630656901862" duration="33000" />
       <workItem from="1630656901862" duration="33000" />
       <workItem from="1630888067668" duration="852000" />
       <workItem from="1630888067668" duration="852000" />
-      <workItem from="1630893291690" duration="11480000" />
+      <workItem from="1630893291690" duration="11740000" />
+      <workItem from="1630976664603" duration="3578000" />
     </task>
     </task>
     <task id="LOCAL-00001" summary="修改客户跟进列表">
     <task id="LOCAL-00001" summary="修改客户跟进列表">
       <created>1630486551669</created>
       <created>1630486551669</created>
@@ -341,7 +331,14 @@
       <option name="project" value="LOCAL" />
       <option name="project" value="LOCAL" />
       <updated>1630919726185</updated>
       <updated>1630919726185</updated>
     </task>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="客户资料维护修改">
+      <created>1630920690177</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1630920690177</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
     <servers />
   </component>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
   <component name="TypeScriptGeneratedFilesManager">

+ 8 - 5
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1774,7 +1774,7 @@
     date_format(um.date_update_time,'%Y-%m-%d %H:%i:%s')dateUpdateTimes
     date_format(um.date_update_time,'%Y-%m-%d %H:%i:%s')dateUpdateTimes
     from `user` u
     from `user` u
         <if test="shiroType==0">
         <if test="shiroType==0">
-        left join (select b.buyer_id from t_order_task a left join t_order_new b
+          inner join (select b.buyer_id from t_order_task a left join t_order_new b
             on a.order_no = b.order_no where a.main = 1 and a.split_status in (0, 1)
             on a.order_no = b.order_no where a.main = 1 and a.split_status in (0, 1)
             and a.task_receiver = #{aid} group by b.buyer_id) t0 on t0.buyer_id = u.id
             and a.task_receiver = #{aid} group by b.buyer_id) t0 on t0.buyer_id = u.id
         </if>
         </if>
@@ -1807,11 +1807,14 @@
       <if test="startTime !=null and endTime !=null">
       <if test="startTime !=null and endTime !=null">
     and u.transfer_time between #{startTime} and #{endTime}
     and u.transfer_time between #{startTime} and #{endTime}
       </if>
       </if>
+        <if test="page_sql != null">
+          ${page_sql}
+        </if>
   </select>
   </select>
   <select id="findMainProductsCount" resultType="java.lang.Integer">
   <select id="findMainProductsCount" resultType="java.lang.Integer">
   select count(*) from `user` u
   select count(*) from `user` u
   <if test="shiroType==0">
   <if test="shiroType==0">
-    left join (select b.buyer_id from t_order_task a left join t_order_new b
+    inner join (select b.buyer_id from t_order_task a left join t_order_new b
     on a.order_no = b.order_no where a.main = 1 and a.split_status in (0, 1)
     on a.order_no = b.order_no where a.main = 1 and a.split_status in (0, 1)
     and a.task_receiver = #{aid} group by b.buyer_id) t0 on t0.buyer_id = u.id
     and a.task_receiver = #{aid} group by b.buyer_id) t0 on t0.buyer_id = u.id
   </if>
   </if>
@@ -1820,9 +1823,9 @@
       left join admin a on u.aid=a.id left join department d on a.department_id =d.id
       left join admin a on u.aid=a.id left join department d on a.department_id =d.id
     </if>
     </if>
   where u.share_type in (0, 2, 3) and u.source in(1,2,3)
   where u.share_type in (0, 2, 3) and u.source in(1,2,3)
-  <if test="shiroType==1">
-    and u.information_maintainer = #{aid}
-  </if>
+    <if test="shiroType==1">
+      and u.information_maintainer = #{aid}
+    </if>
     <if test="shiroType==2">
     <if test="shiroType==2">
       <if test="adminName !=null">
       <if test="adminName !=null">
         and  a.name like concat('%', #{adminName},'%')
         and  a.name like concat('%', #{adminName},'%')

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -70,7 +70,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 
 
 
 
 avatar.host=//static.jishutao.com
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.85
+static.host=//static.jishutao.com/1.1.86
 
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7
 wx.appSecret=081744369d42405be58fe37f892631f7

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -60,7 +60,7 @@ user.private.max=1000
 #客户释放提醒
 #客户释放提醒
 user_remind_days=15
 user_remind_days=15
 
 
-static.host=//static.jishutao.com/1.1.85
+static.host=//static.jishutao.com/1.1.86
 portal.host=//static.jishutao.com/portal/2.0.6
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload
 avatar.upload.host=//static.jishutao.com/upload