Merge remote-tracking branch 'origin/master'

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -187,9 +187,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select("SELECT za.contents FROM customercollectgoods  AS crg  LEFT JOIN goods_accessories AS ga ON crg.goods_id = ga.goods_id LEFT JOIN zy_accessories AS za ON ga.accessories_id = za.id where crg.id=#{id}")
     List<String> getscgoodfi(String id);
 
-    @Select("select id from customer_receiving_address where update_by =#{needuname}")
+    @Select("select id from customer_receiving_address where user_id =#{needuname}")
     List<String> getuserdizhi(String needuname);
 
-    @Select("select id from customer_invoice where update_by =#{needuname}")
+    @Select("select id from customer_invoice where user_id =#{needuname}")
     List<String> getuserfapiao(String needuname);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -577,13 +577,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		String needid = uids.get(n);
 		SysUser sysUser = new  SysUser();
 		sysUser = userMapper.getneeduser(needid);
-		String needuname = sysUser.getUsername();
+		String needuname = sysUser.getId();
 		List<String> dizhi = userMapper.getuserdizhi(needuname);
 		List<String> fapiao = userMapper.getuserfapiao(needuname);
 		SysUserdfVO sdfvo = new SysUserdfVO();
 		sdfvo.setSysUser(sysUser);
 		sdfvo.setDizhi(dizhi);
 		sdfvo.setFapiao(fapiao);
+		System.out.println(sdfvo);
 		return sdfvo;
 	}