fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityController.java

@@ -104,7 +104,6 @@ public class DistributionActivityController extends BaseController {
     }
 
     /**
-<<<<<<< HEAD
      * 查询【请填写功能名称】列表
      */
     @ApiOperation("查询活动详情商品列表")

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserDetailsServiceImpl.java

@@ -37,13 +37,6 @@ public class UserDetailsServiceImpl implements UserDetailsService
     {
         //普通系统用户
         SysUser user = userService.selectUserByUserName(username);
-        System.out.println(234234);
-        System.out.println(user);
-        System.out.println(user.getPassword());
-        if (!SecurityUtils.matchesPassword("admin123",user.getPassword()))
-        {
-            throw new BaseException("密码错了");
-        }
         if (Validator.isNull(user))
         {
             log.info("登录用户：{} 不存在.", username);
@@ -64,7 +57,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
     }
 
     public UserDetails createLoginUser(SysUser user)
-    { System.out.println("113435");
+    { 
         return new LoginUser(user, permissionService.getMenuPermission(user));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityPosterServiceImpl.java

@@ -163,7 +163,7 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
             throw new CustomException("活动不存在");
         }
         DistributionSellerVo sellerVo = iDistributionSellerService.queryById(bo.getSellerId());
-        if(Validator.isNotEmpty(sellerVo)){
+        if(Validator.isEmpty(sellerVo)){
             throw new CustomException("非业务员");
         }
         DistributionLinkAddBo addBo = new DistributionLinkAddBo();

zhongzheng-system/src/main/resources/mapper/modules/system/SysUserMapper.xml

@@ -28,6 +28,7 @@
         <result property="preLoginDate" column="pre_login_date"/>
         <result property="pwdTime" column="pwd_time"/>
         <result property="idCard" column="id_card" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
+        <result property="sellerId" column="seller_id"/>
         <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" column="user_id" select="findRolesList" javaType="java.util.List" />
     </resultMap>
@@ -79,6 +80,8 @@
                u.create_by,
                u.create_time,
                u.remark,
+               u.id_card,
+               u.seller_id,
                u.pwd_time,
                d.dept_id,
                d.parent_id,