Browse Source

修改冲突

yumeng 4 năm trước cách đây
mục cha
commit
9a7d260613

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/UserAllocationMapper.java

@@ -59,7 +59,7 @@ public interface UserAllocationMapper extends BaseMapper<UserAllocation> {
 
     List<JSONObject> selectAccountsByKuaishouUserId(@Param("userId") Long userId);
 
-    int updateProjectStrategyStatus(@Param("accountId") Long accountId, @Param("projectStrategy") Integer projectStrategy);
+    int updateProjectStrategyStatus(@Param("accountId") Long accountId,@Param("projectStrategy") Integer projectStrategy);
 
     List<Long> queryAutomaticAccounts(@Param("projectId") Long projectId);
 

+ 1 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml

@@ -247,12 +247,7 @@
           and account_id = #{accountId}
     </select>
 
-    <!-- 根据账户id 查看财务账户 -->
-    <select id="getAccountListByProjectId" resultType="java.lang.Long">
-        select account_id from ctop_user_allocation
-        WHERE account_status = 0
-          AND project_id = #{projectId}
-    </select>
+
 
     <select id="getAccountInfoBySalesId" resultType="cn.com.ctop.common.module.entity.UserAllocation">
         select cua.*