Commit 5d4fd3e7 authored by maliang's avatar maliang

上传bug修复

parent 2e5aed81
...@@ -9,7 +9,7 @@ import java.util.List; ...@@ -9,7 +9,7 @@ import java.util.List;
@Mapper @Mapper
public interface CopyrightDao { public interface CopyrightDao {
List<Integer> selectUserAll(); List<Long> selectUserAll();
List<BaseSettlement> selectTableListMonth(@Param("copyrightId") Integer copyrightId,@Param("page") Integer page,@Param("limit")Integer limit); List<BaseSettlement> selectTableListMonth(@Param("copyrightId") Integer copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
......
...@@ -52,7 +52,7 @@ public interface UserDao { ...@@ -52,7 +52,7 @@ public interface UserDao {
int saveUserRoles(@Param("userId") Long userId, @Param("roleIds") List<Long> roleIds); int saveUserRoles(@Param("userId") Long userId, @Param("roleIds") List<Long> roleIds);
int updateBaseSettlementUserMap(@Param("userId") Long userId, @Param("baseSettlement") List<BaseSettlement> baseSettlements); int updateBaseSettlementUserMap(@Param("userId") Long userId, @Param("baseSettlementMap") List<BaseSettlement> baseSettlements);
int update(SysUser user); int update(SysUser user);
} }
...@@ -125,8 +125,8 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -125,8 +125,8 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
public void updateUserCopyrightMap(){ public void updateUserCopyrightMap(){
List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightAll(); List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightAll();
List<Integer> users = copyrightDao.selectUserAll(); List<Long> users = copyrightDao.selectUserAll();
for (Integer user : users) { for (Long user : users) {
for (BaseSettlement baseSettlement : baseSettlements) { for (BaseSettlement baseSettlement : baseSettlements) {
baseSettlement.setUserId(user); baseSettlement.setUserId(user);
} }
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
FROM bi_report.book_banquanweihu a group by a.copyright_id,a.copyright_name; FROM bi_report.book_banquanweihu a group by a.copyright_id,a.copyright_name;
</select> </select>
<select id="selectUserAll" resultType="java.util.List" > <select id="selectUserAll" resultType="Long" >
SELECT id SELECT id
FROM sys_user; FROM sys_user;
</select> </select>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
ON a.user_id=b.id ON a.user_id=b.id
</select> </select>
<select id="getCopyrightUserMap" resultType="com.boot.security.server.model.AdvertiserUserMap"> <select id="getCopyrightUserMap" resultType="com.boot.security.server.model.BaseSettlement">
SELECT user_id as userId,nickname,copyright_id as copyrightId,copyright_name as copyrightName,a.status as status SELECT user_id as userId,nickname,copyright_id as copyrightId,copyright_name as copyrightName,a.status as status
FROM user_copyright_map a INNER JOIN sys_user b FROM user_copyright_map a INNER JOIN sys_user b
ON a.user_id=b.id ON a.user_id=b.id
......
...@@ -103,6 +103,7 @@ function init(){ ...@@ -103,6 +103,7 @@ function init(){
//data : JSON.stringify(list), //data : JSON.stringify(list),
//请求成功 //请求成功
success : function(result) { success : function(result) {
console.log(result.data)
setTable(result.data); setTable(result.data);
}, },
//请求失败,包含具体的错误信息 //请求失败,包含具体的错误信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment