页面BUG以及 信息修改

suishenbang-admin/src/main/resources/application-dev-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.32.2.212:3306/suishenbang_oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://10.32.2.212:3306/suishenbang_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: libang
             # 从库数据源

suishenbang-admin/src/main/resources/application-test-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                  url: jdbc:mysql://10.32.2.212:3306/suishenbang_oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                  url: jdbc:mysql://10.32.2.212:3306/suishenbang_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                   username: root
                   password: libang
             # 从库数据源

suishenbang-admin/src/main/resources/templates/system/user/user.html

@@ -189,10 +189,7 @@
 		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.userId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>删除</a> ');
 		                actions.push('<a class="btn btn-info btn-xs ' + resetPwdFlag + '" href="javascript:void(0)" onclick="resetPwd(\'' + row.userId + '\')"><i class="fa fa-key"></i>重置</a>');
-		                if(row.isBindingWx>0){
-                            actions.push('<a class="btn btn-warning btn-xs " href="javascript:void(0)" onclick="wxDetail(\'' + row.userId + '\')"><i class="fa fa-search"></i>查看微信</a> ');
-                            actions.push('<a class="btn btn-warning btn-xs ' + bondedFlag + '" href="javascript:void(0)" onclick="bonded(\'' + row.userId + '\')"><i class="fa fa-chain-broken"></i>解绑</a>');
-                        }
+
 
 		                return actions.join('');
 		            }

suishenbang-api/src/main/resources/application-dev-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.32.2.212:3306/suishenbang_oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://10.32.2.212:3306/suishenbang_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: libang
             # 从库数据源

suishenbang-api/src/main/resources/application-dev.yml

@@ -20,6 +20,8 @@ security:
   platMap: "{steelfurniture:'cd72c223-923f-44a3-aede-b9f07dcd56b8'}"
   #开发模式下 可以使用swagger测试 放过验签环节
   isDev: true
+libang:
+  getUserByTicket: http://m-eportal.nipponpaint.com.cn/BasicV2/Wechat/GetTicket
 
 
 # 开发环境配置

suishenbang-api/src/main/resources/application-test-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.32.2.212:3306/suishenbang_oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://10.32.2.212:3306/suishenbang_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: libang
             # 从库数据源

suishenbang-api/src/main/resources/application-test.yml

@@ -20,7 +20,8 @@ security:
   platMap: "{steelfurniture:'cd72c223-923f-44a3-aede-b9f07dcd56b8'}"
   #开发模式下 可以使用swagger测试 放过验签环节
   isDev: true
-
+libang:
+  getUserByTicket: http://m-eportal.nipponpaint.com.cn/BasicV2/Wechat/GetTicket
 
 # 开发环境配置
 server:

suishenbang-api/src/main/resources/application-uat.yml

@@ -20,7 +20,8 @@ security:
   platMap: "{steelfurniture:'cd72c223-923f-44a3-aede-b9f07dcd56b8'}"
   #开发模式下 可以使用swagger测试 放过验签环节
   isDev: true
-
+libang:
+  getUserByTicket: http://m-eportal.nipponpaint.com.cn/BasicV2/Wechat/GetTicket
 
 # 开发环境配置
 server:
@@ -28,7 +29,7 @@ server:
   port: 10001
   servlet:
     # 应用的访问路径
-    context-path: /api
+    context-path: /wxportal-api
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -50,7 +51,7 @@ spring:
     #字段为空不生效
     default-property-inclusion: non_null
   profiles:
-    include: dev-druid
+    include: uat-druid
   # 文件上传
   servlet:
      multipart:
@@ -96,9 +97,9 @@ mybatis:
     configLocation: classpath:mybatis/mybatis-config.xml
 qiyeweixin:
   #企业微信id
-  corpid: wx5fd543ad17678381
+  corpid: ww5444eb205d75e730
   #企业应用的凭证密钥
   #Cs9omiMVyz3cLm2D5T51i4bCDarHhIdl5uTaj__E-38  随身邦
-  corpsecret: Cs9omiMVyz3cLm2D5T51i4bCDarHhIdl5uTaj__E-38
+  corpsecret: hafspbfljYGiKEdAizhyt3jlxtmZfT9yXnZ5go3ykfw
   #应用id
-  agentId: 1000038
+  agentId: 1000079

suishenbang-api/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: uat
 #开发环境dev 测试环境test 正式环境prod  启动时可以设置参数Java -jar xxxxxx.jar spring.profiles.actiove=prod

suishenbang-order/src/main/resources/templates/order/customers/customers.html

@@ -127,6 +127,14 @@
                 }]
             };
             $.table.init(options);
+
+            //失去焦点事件
+            //去除前后空格
+            $(".select-list input").blur(function (event){
+                var val =  $(event.target).val();
+                val = val.replace(/^\s+|\s+$/g,"")
+                $(event.target).val(val);
+            })
         });
     </script>
 </body>

suishenbang-order/src/main/resources/templates/order/orderSalesDetail/orderSalesDetail.html

@@ -15,7 +15,7 @@
                                 <input type="text" name="companyName"/>
                             </li>
                             <li>
-                                <p>销售大区名称：</p>
+                                <p>销售大区：</p>
                                 <input type="text" name="saledeptName"/>
                             </li>
                             <li>
@@ -35,13 +35,9 @@
                                 <input type="text" name="empName"/>
                             </li>
                             <li>
-                                <p>经销商名称：</p>
-                                <input type="text" name="customerName"/>
+                                <p>经销商：</p>
+                                <input type="text" name="customerName" on/>
                             </li>
-                            <!--<li class="select-time">
-                                <p>日期：</p>
-                                <input type="text" name="calMonth" class="time-input" id="calMonthDate" placeholder="yyyy-MM" style="cursor: default;width: 200px;"/>
-                            </li>-->
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -167,6 +163,14 @@
                 }]
             };
             $.table.init(options);
+
+            //失去焦点事件
+                //去除前后空格
+            $(".select-list input").blur(function (event){
+                var val =  $(event.target).val();
+                val = val.replace(/^\s+|\s+$/g,"")
+                $(event.target).val(val);
+            })
         });
 
        /* //订单结束时间

suishenbang-order/src/main/resources/templates/order/orderbase/orderbase.html

@@ -11,19 +11,19 @@
                 <form id="formId" class="form-horizontal m">
                     <div class="row">
 
-                        <div class="form-group col-sm-3 row">
+                        <div class="form-group col-sm-4 row">
                             <label class="control-label col-sm-4">订单号：</label>
                             <div class="input-group col-sm-8">
                                 <input class="form-control" type="text" name="docNumber"/>
                             </div>
                         </div>
-                        <div class="form-group col-sm-3">
+                        <div class="form-group col-sm-4">
                             <label class="control-label col-sm-4">经销商名字：</label>
                             <div class="input-group col-sm-8">
                                 <input class="form-control" type="text" name="customerName"/>
                             </div>
                         </div>
-                        <div class="form-group col-sm-3 row">
+                        <div class="form-group col-sm-4 row">
                             <label class="control-label col-sm-4">经销商编号：</label>
                             <div class="input-group col-sm-8">
                                 <input class="form-control" type="text" name="customerCode"/>
@@ -32,19 +32,19 @@
 
                     </div>
                     <div class="row">
-                        <div class="form-group col-sm-3 row">
-                            <label class="control-label col-sm-4">销售组织名字：</label>
+                        <div class="form-group col-sm-4 row">
+                            <label class="control-label col-sm-4">销售组织：</label>
                             <div class="input-group col-sm-8">
                                 <input class="form-control" type="text" name="salesOrgName"/>
                             </div>
                         </div>
-                        <div class="form-group col-sm-3">
-                            <label class="control-label col-sm-4">销售组织编码：</label>
+                        <div class="form-group col-sm-4">
+                            <label class="control-label col-sm-4">销售编码：</label>
                             <div class="input-group col-sm-8">
                                 <input class="form-control" type="text" name="salesOrg"/>
                             </div>
                         </div>
-                        <div class="form-group col-sm-3 row">
+                        <div class="form-group col-sm-4 row">
                             <label class="control-label col-sm-4">信用状态：</label>
                             <div class="input-group col-sm-8">
                                 <select class="form-control m-b" name="creditStatus">
@@ -144,6 +144,14 @@
                 ]
             };
             $.table.init(options);
+
+            //失去焦点事件
+            //去除前后空格
+            $(".select-list input").blur(function (event){
+                var val =  $(event.target).val();
+                val = val.replace(/^\s+|\s+$/g,"")
+                $(event.target).val(val);
+            })
         });
         //订单开始时间
         $("#dp-s-orderCreate").datetimepicker({

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -166,7 +166,7 @@ public class AnalysisDiyCustomerComponent {
                     userExt.setIsCustomerManager(isManager + "");
                     userExt.setSapEmployeeId(userNo);
                     userExt.setOrgCode(jo.getString("depCode"));
-
+                    userExt.setPostName("DIY经销商");
                     /**======== 构建diy用户wx信息表 start===============*/
                     WxQyUser wxQyUser = new WxQyUser();
                     wxQyUser.setUserid(jo.getString("userid"));

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -55,7 +55,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
 
 
     /**
-     * 解析部门数据  异步执行
+     * 解析DIY用户数据  异步执行
      * @param packageId
      * @return
      */
@@ -130,7 +130,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     userExt.setBossEmployeeId(m.getBossEmployeeId());
                     userExt.setBossName(m.getBossName());
                     userExt.setSapEmployeeId(m.getSapEmployeeId());
-
+                    userExt.setPostCode(m.getEmployeePost());
+                    userExt.setPostName(m.getEmployeePostName());
                     //判断用户所处销售层级
 
                     String fildName ="";

suishenbang-system/src/main/java/com/dgtly/system/domain/SysMenu.java

@@ -122,7 +122,7 @@ public class SysMenu extends BaseEntity
         this.orderNum = orderNum;
     }
 
-    @Size(min = 0, max = 200, message = "请求地址不能超过200个字符")
+    @Size(min = 0, max = 400, message = "请求地址不能超过400个字符")
     public String getUrl()
     {
         return url;

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUser.java

@@ -99,8 +99,6 @@ public class SysUser extends BaseEntity
     /** 岗位组 */
     private Long[] postIds;
 
-    /** 是否绑定企业微信信息 */
-    private String isBindingWx;
 
     /** 用户销售信息扩展 */
     private SysUserExt  sysUserExt;
@@ -401,13 +399,6 @@ public class SysUser extends BaseEntity
         this.schedulDetail = schedulDetail;
     }
 
-    public String getIsBindingWx() {
-        return isBindingWx;
-    }
-
-    public void setIsBindingWx(String isBindingWx) {
-        this.isBindingWx = isBindingWx;
-    }
 
     public SysUserExt getSysUserExt() {
         return sysUserExt;

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUserExt.java

@@ -42,6 +42,12 @@ public class SysUserExt extends BaseEntity
     /** 是否是经销商负责人 1是  0不是*/
     private String isCustomerManager;
 
+    /** 岗位代码 */
+    private String postCode;
+
+    /** 岗位名称 */
+    private String postName;
+
     public void setUserId(Long userId)
     {
         this.userId = userId;
@@ -121,6 +127,22 @@ public class SysUserExt extends BaseEntity
         this.isCustomerManager = isCustomerManager;
     }
 
+    public String getPostCode() {
+        return postCode;
+    }
+
+    public void setPostCode(String postCode) {
+        this.postCode = postCode;
+    }
+
+    public String getPostName() {
+        return postName;
+    }
+
+    public void setPostName(String postName) {
+        this.postName = postName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

suishenbang-system/src/main/java/com/dgtly/system/mapper/SysUserMapper.java

@@ -152,20 +152,10 @@ public interface SysUserMapper
     public SysUser checkEmailUnique(@Param("email")String email,@Param("companyId") Long companyId);
 
     /**
-     * @Description: 查询已经排班的需要考勤的员工信息
-     * @Param: [user]
-     * @Return: java.util.List<com.dgtly.system.domain.SysUser>
-     * @Author: koucx
-     * @Date: 2019-11-01
-    **/
-    List<SysUser> needSignUser(SysUser user);
-
-    /*
-     * @Description: 根据优图ID查询系统用户信息
-     * @Author: shangkai
-     * @Date: 2020-1-13
-     **/
-    SysUser selectUserInfoByPersionId(@Param("persionId") String persionId);
-
-
+     * 根据立邦员工id查找用户
+     *
+     * @param emplyeeId 立邦员工id
+     * @return 结果
+     */
+    public SysUser selectUserByEmplyeeId(String emplyeeId);
 }

suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserService.java

@@ -217,21 +217,11 @@ public interface ISysUserService
      */
     public int changeStatus(SysUser user);
 
-
-    /*
-     * @Description: 查询已经排班的需要考勤的员工信息
-     * @Author: koucx
-     * @Date: 2019-11-01
-    **/
-    public List<SysUser> needSignUser(SysUser user);
-
-    /*
-     * @Description: 根据优图ID查询系统用户信息
-     * @Author: shangkai
-     * @Date: 2020-1-13
-     **/
-    public SysUser selectUserInfoByPersionId(String persionId);
-
-
-
+    /**
+     * 根据立邦员工id查找用户
+     *
+     * @param emplyeeId 立邦员工id
+     * @return 结果
+     */
+    SysUser selectUserByEmplyeeId(String emplyeeId);
 }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserServiceImpl.java

@@ -556,15 +556,6 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.updateUser(user);
     }
 
-    @Override
-    public List<SysUser> needSignUser(SysUser user) {
-        return userMapper.needSignUser(user);
-    }
-
-    @Override
-    public SysUser selectUserInfoByPersionId(String persionId) {
-        return userMapper.selectUserInfoByPersionId(persionId);
-    }
 
 
 
@@ -578,4 +569,16 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectAllUserLoginName();
     }
 
+
+    /**
+     * 根据立邦员工id查找用户
+     *
+     * @param emplyeeId 立邦员工id
+     * @return 结果
+     */
+    @Override
+    public SysUser selectUserByEmplyeeId(String emplyeeId) {
+        return  userMapper.selectUserByEmplyeeId(emplyeeId);
+    }
+
 }

suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -25,7 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"     column="update_by"    />
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
-        <result property="isBindingWx"  column="isBindingWx"  />
         <!--<result property="salesLevel"   column="sales_level"  />-->
         <!--<result property="orgName"      column="org_name"     />-->
         <!--<result property="orgCode"      column="org_code"     />-->
@@ -69,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bossName"    column="boss_name"    />
         <result property="customerCode"    column="customer_code"    />
         <result property="isCustomerManager"    column="is_customer_manager"    />
+		<result property="postName"    column="post_name"    />
+		<result property="postCode"    column="post_code"    />
     </resultMap>
 	
 	<sql id="selectUserVo">
@@ -77,7 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         		c.company_name,
        		    d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
-       		    suse.sales_level,suse.org_name,suse.org_code,suse.sap_employee_id,suse.boss_employee_id,suse.boss_name,suse.customer_code,suse.is_customer_manager
+       		    suse.sales_level,suse.org_name,suse.org_code,suse.sap_employee_id,suse.boss_employee_id,suse.boss_name,suse.customer_code,suse.is_customer_manager,
+       		    suse.post_name,suse.post_code
 		from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_company c on u.company_id = c.id
@@ -91,13 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag,
           u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
           d.dept_name, d.leader,
-         wqu.count1 isBindingWx,
-        suse.sales_level,suse.org_name,suse.org_code
+        suse.sales_level,suse.org_name,suse.org_code,suse.post_name
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_company c on u.company_id = c.id
         left join sys_user_ext suse on suse.user_id = u.user_id
-        left join (select sys_user_id, count(userId) as count1 from wx_qy_user group by sys_user_id) wqu on wqu.sys_user_id = u.user_id
 		where u.del_flag = '0'
 		<if test="loginName != null and loginName != ''">
 			AND u.login_name like concat('%', #{loginName}, '%')
@@ -286,22 +286,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)
 	</insert>
 
-	<select id="needSignUser" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
-		from sys_user u
-		left join sys_dept d on u.dept_id = d.dept_id
-		<if test="companyId != null and companyId != 0"> and u.company_id = #{companyId}</if>
 
-	</select>
-
-	<select id="selectUserInfoByPersionId" parameterType="String" resultMap="SysUserResult">
-		select u.user_id, u.dept_id,u.company_id,u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
-		from sys_user u
-		left join sys_dept d on u.dept_id = d.dept_id
-		left join youtu_headimg h on u.user_id = h.user_id
-		where u.del_flag = '0' and h.youtu_id = #{persionId}
 
-	</select>
 
     <select id="selectAllUserLoginName"  resultType="String">
         select u.login_name
@@ -337,4 +323,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
 
+	<select id="selectUserByEmplyeeId" parameterType="String" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where suse.sap_employee_id = #{emplyeeId}
+	</select>
+
 </mapper> 

suishenbang-system/src/main/resources/mapper/system/SysUserSalesExtMapper.xml

@@ -14,10 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bossName"    column="boss_name"    />
         <result property="customerCode"    column="customer_code"    />
         <result property="isCustomerManager"    column="is_customer_manager"    />
+        <result property="postCode"    column="post_code"    />
+        <result property="postName"    column="post_name"    />
     </resultMap>
 
     <sql id="selectSysUserExtVo">
-        select user_id, org_code, sales_level, org_name, sap_employee_id, boss_employee_id, boss_name,customer_code,is_customer_manager from sys_user_ext
+        select user_id, org_code, sales_level, org_name, sap_employee_id, boss_employee_id, boss_name,customer_code,is_customer_manager,post_code,post_name from sys_user_ext
     </sql>
 
     <select id="selectSysUserExtList" parameterType="SysUserExt" resultMap="SysUserExtResult">
@@ -31,6 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bossName != null  and bossName != ''"> and boss_name like concat('%', #{bossName}, '%')</if>
             <if test="customerCode != null and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
             <if test="isCustomerManager != null  and isCustomerManager != ''"> and is_customer_manager = #{isCustomerManager}</if>
+            <if test="postCode != null and postCode != ''"> and post_code like concat('%', #{postCode}, '%')</if>
+            <if test="postName != null  and postName != ''"> and post_name like concat('%', #{postName}, '%')</if>
         </where>
     </select>
     
@@ -51,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bossName != null  and bossName != ''">boss_name,</if>
             <if test="customerCode != null and customerCode != ''">  customer_code,</if>
             <if test="isCustomerManager != null  and isCustomerManager != ''">  is_customer_manager,</if>
+            <if test="postCode != null and postCode != ''">  post_code ,</if>
+            <if test="postName != null  and postName != ''">  post_name ,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null ">#{userId},</if>
@@ -62,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bossName != null  and bossName != ''">#{bossName},</if>
             <if test="customerCode != null and customerCode != ''"> #{customerCode},</if>
             <if test="isCustomerManager != null  and isCustomerManager != ''"> #{isCustomerManager},</if>
+            <if test="postCode != null and postCode != ''">  #{postCode}, </if>
+            <if test="postName != null  and postName != ''">  #{postName},</if>
          </trim>
     </insert>
 
@@ -76,6 +84,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bossName != null  and bossName != ''">boss_name = #{bossName},</if>
             <if test="customerCode != null and customerCode != ''"> customer_code =#{customerCode}, </if>
             <if test="isCustomerManager != null  and isCustomerManager != ''"> is_customer_manager = #{isCustomerManager},</if>
+            <if test="postCode != null and postCode != ''">  post_code = #{postCode},</if>
+            <if test="postName != null  and postName != ''">  post_name = #{postName}, </if>
         </trim>
         where user_id = #{userId}
     </update>
@@ -105,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bossName != null  and bossName != ''">boss_name,</if>
             <if test="customerCode != null and customerCode != ''">  customer_code,</if>
             <if test="isCustomerManager != null  and isCustomerManager != ''">  is_customer_manager,</if>
+            <if test="postCode != null and postCode != ''"> post_code ,</if>
+            <if test="postName != null  and postName != ''"> post_name ,</if>
 
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -117,6 +129,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bossName != null  and bossName != ''">#{bossName},</if>
             <if test="customerCode != null and customerCode != ''"> #{customerCode},</if>
             <if test="isCustomerManager != null  and isCustomerManager != ''"> #{isCustomerManager},</if>
+            <if test="postCode != null and postCode != ''">  #{postCode},</if>
+            <if test="postName != null  and postName != ''">#{postName}, </if>
 
         </trim>
         ON DUPLICATE KEY UPDATE
@@ -129,6 +143,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bossName != null  and bossName != ''">boss_name = #{bossName},</if>
             <if test="customerCode != null and customerCode != ''"> customer_code=#{customerCode},</if>
             <if test="isCustomerManager != null  and isCustomerManager != ''">is_customer_manager= #{isCustomerManager},</if>
+            <if test="postCode != null and postCode != ''"> post_code = #{postCode}, </if>
+            <if test="postName != null  and postName != ''">  post_name = #{postName}, </if>
 
         </trim>
   </insert>

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -5,6 +5,10 @@ import com.dgtly.common.annotation.ApiPassToken;
 import com.dgtly.common.core.controller.ApiBaseController;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.core.domain.ParameterObject;
+import com.dgtly.common.utils.http.HttpUtils;
+import com.dgtly.common.utils.security.EncryptPassWordClass;
+import com.dgtly.wxportal.domain.WxBanner;
+import com.dgtly.wxportal.domain.WxMagnet;
 import com.dgtly.wxportal.utils.qywxutils.QyWxSendMessageUtil;
 import com.dgtly.wxportal.utils.qywxutils.QyWxUserUtil;
 import com.dgtly.common.utils.RedisUtil;
@@ -20,10 +24,13 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 @Api(tags = "企业微信相关API", description = "提供企业微信相关的AP")
 @RequestMapping("wx")
@@ -46,6 +53,8 @@ public class WxController extends ApiBaseController {
     @Autowired
     private QyWxSendMessageUtil qyWxSendMessageUtil;
 
+    @Value(value = "${libang.getUserByTicket}")
+    private String getUserByTicketUrl;
 
 
     @ApiOperation(value = "获取微信授权跳转url",notes = "参数：{url:www.baidu.com}")
@@ -63,7 +72,7 @@ public class WxController extends ApiBaseController {
     @ApiOperation(value = "根据微信coed获取用户信息",
             notes = "参数：{code:123} code微信跳转回来的携带的用户code" +
                     "错误：301 当前用户不是当前企业用户成员" +
-                    "错误：302 当前用户没有绑定")
+                    "错误：302 当前用户不属于DIY用户或经销商用户")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "params" , paramType = "body")
     })
@@ -78,30 +87,12 @@ public class WxController extends ApiBaseController {
             return AjaxResult.error(301,"当前用户不是企业成员");
         }
         userId = json.getString("UserId");
-        WxQyUser wxQyUser = qyWxUserUtil.gerUserDetail(userId);
-        WxQyUser resWxQyUser = wxQyUserService.selectWxQyUserById(wxQyUser.getUserid());
-        if(resWxQyUser==null){
-            int i = wxQyUserService.insertWxQyUser(wxQyUser);
-            if(i>0){
-                return AjaxResult.error(302,"当前用户没有绑定").putKV("wxUserInfo",wxQyUser);
-            }else{
-                return AjaxResult.error();
-            }
-        }
-
-        if(resWxQyUser.getSysUserId()==null){
-            return AjaxResult.error(302,"当前用户没有绑定").putKV("wxUserInfo",wxQyUser);
-        }
-        try{
-            wxQyUser.setSysUserId(resWxQyUser.getSysUserId());
-
-            wxQyUserService.updateWxQyUser(wxQyUser);
-        }catch(Exception e){
-            logger.error("更新微信用户信息时出错",e);
-            e.printStackTrace();
+        SysUser user = sysUserService.selectUserByLoginName(userId);
+        if(user==null){
+            return AjaxResult.error(302,"当前用户不属于DIY用户或经销商用户");
+        }else{
+            return AjaxResult.success().putKV("sysUser",user);
         }
-        SysUser user=sysUserService.selectUserById(resWxQyUser.getSysUserId());
-        return AjaxResult.success().putKV("wxUser",resWxQyUser).putKV("sysUser",user);
     }
 
 
@@ -162,7 +153,64 @@ public class WxController extends ApiBaseController {
         return AjaxResult.success();
     }
 
+    @ApiOperation(value = "根据立邦微信基建返回的Ticket获取用户信息",notes = "参数：{'Ticket':1}=" +
+            " 错误：301 根据Ticket获取用户信息失败" +
+            "错误：302 当前用户可能不属于此企业" +
+            "错误：303 当前用户可能不属于DIY人员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body")
+    })
+    @PostMapping("/getUserByTicket")
+    public Object getUserByTicket(){
+        ParameterObject obj =  getParameterObject();
+        obj.checkParameterNotNull("Ticket");
+        JSONObject json  =new JSONObject();
+        json.put("Ticket",obj.getString("Ticket"));
+        String res = HttpUtils.sendJsonPost(getUserByTicketUrl,json);
+        logger.info("根据Ticket获取的用户信息为{}",res);
+        json = JSONObject.parseObject(res);
+        if(json.containsKey("Code")&&json.getInteger("Code")==0){
+            if(json.containsKey("Data")&&json.getJSONObject("Data")!=null){
+                json =  json.getJSONObject("Data");
+                if(json.containsKey("Number")&&json.getString("Number")!=null&&!json.getString("Number").trim().equals("")){
+                    String emplyeeId = json.getString("Number");
+                    SysUser user = sysUserService.selectUserByEmplyeeId(emplyeeId);
+                    if(user!=null){
+                        return AjaxResult.success().putKV("sysUser",user);
+                    }else{
+                        return AjaxResult.error(303,"当前用户可能不是DIY人员");
+                    }
+                }else{
+                    return AjaxResult.error(302,"当前用户可能不属于此企业");
+                }
+            }
+        }
+        return AjaxResult.error(301,"根据Ticket获取用户信息失败");
+    }
 
+    @ApiOperation(value = "根据账户密码获取用户权限",notes = "参数：{'username':'1','password':'xxx'}" +
+            " 错误：301 密码错误" +
+            "错误：302  查无此人")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body")
+    })
+    @PostMapping("/getUserByPassWord")
+    public Object getUserByPassWord(){
+        ParameterObject obj =  getParameterObject();
+        obj.checkParameterNotNull("username,password");
+        String username = obj.getString("username");
+        String password = obj.getString("password");
+        SysUser user = sysUserService.selectUserByLoginName(username);
+        if(user==null){
+            return AjaxResult.error(302,"查无此人");
+        }
+        String pass = EncryptPassWordClass.encryptPassword(user.getLoginName(),password,user.getSalt());
+        if(pass.equals(user.getPassword())){
+            return AjaxResult.success().putKV("sysUser",user);
+        }else{
+            return AjaxResult.error(301,"密码错误");
+        }
+    }
 
 
 }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/domain/WxMagnet.java

@@ -77,7 +77,7 @@ public class WxMagnet extends BaseEntity
         this.orderNum = orderNum;
     }
 
-    @Size(min = 0, max = 400, message = "请求地址不能超过200个字符")
+    @Size(min = 0, max = 400, message = "请求地址不能超过400个字符")
     public String getUrl()
     {
         return url;
@@ -109,7 +109,7 @@ public class WxMagnet extends BaseEntity
         this.magnetSize = magnetSize;
     }
 
-    @Size(min = 0, max = 400, message = "请求图片地址不能超过200个字符")
+    @Size(min = 0, max = 400, message = "请求图片地址不能超过400个字符")
     public String getBgUrl()
     {
         return bgUrl;

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/edit.html

@@ -251,7 +251,6 @@
             }else{
                 imgUrl = ctx+$("#input_bgUrl").val();
             }
-            debugger
             options = {
                 thumbBox: '.thumbBox_'+size,
                 spinner: '.spinner',