he2802 před 1 rokem
rodič
revize
baad1f0f0f

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -228,4 +228,10 @@ private static final long serialVersionUID=1L;
     /** 题库商家名称 */
     private String questionMerchantName;
 
+
+    private String unitContact;
+
+
+    private String unitTel;
+
 }

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -297,6 +297,12 @@ public class UserVo {
 	@ApiModelProperty("教务电话")
 	private String eduPhone;
 
+	@ApiModelProperty("单位联系人")
+	private String unitContact;
+
+	@ApiModelProperty("单位联系电话")
+	private String unitTel;
+
 	public void setNull(){
 		this.setOpenId(null);
 /*		this.setIdCardImg1(null);

+ 3 - 1
zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -60,6 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="job" column="job"/>
         <result property="shareCode" column="share_code"/>
         <result property="pwdTime" column="pwd_time"/>
+        <result property="unitContact" column="unit_contact"/>
+        <result property="unitTel" column="unit_tel"/>
     </resultMap>
 
 
@@ -696,7 +698,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="dangAnList" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultMap="UserResult">
-        SELECT * from `user` u where  1=1
+        SELECT u.* from `user` u where  1=1
         <if test="telphone != null and telphone != ''" >
             AND u.telphone like concat('%', #{telphone,typeHandler=com.zhongzheng.common.type.EncryptHandler}, '%')
         </if>