Browse Source

改动数据库字段更换所有相关的地方

anderx 7 years ago
parent
commit
c95823c4aa

+ 13 - 15
src/main/java/com/goafanti/common/mapper/OrganizationContactBookMapper.xml

@@ -15,7 +15,7 @@
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="qq" jdbcType="VARCHAR" property="qq" />
     <result column="wechat" jdbcType="VARCHAR" property="wechat" />
-    <result column="depatrment" jdbcType="VARCHAR" property="depatrment" />
+    <result column="department" jdbcType="VARCHAR" property="department" />
     <result column="position" jdbcType="VARCHAR" property="position" />
     <result column="tel_num" jdbcType="VARCHAR" property="telNum" />
     <result column="major" jdbcType="INTEGER" property="major" />
@@ -95,7 +95,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Sun Nov 19 20:34:03 CST 2017.
     -->
-    id, uid, name, sex, mobile, email, qq, wechat, depatrment, position, tel_num, major, 
+    id, uid, name, sex, mobile, email, qq, wechat, department, position, tel_num, major, 
     aid
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationContactBookExample" resultMap="BaseResultMap">
@@ -156,11 +156,11 @@
     -->
     insert into organization_contact_book (id, uid, name, 
       sex, mobile, email, qq, 
-      wechat, depatrment, position, 
+      wechat, department, position, 
       tel_num, major, aid)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{sex,jdbcType=CHAR}, #{mobile,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
-      #{wechat,jdbcType=VARCHAR}, #{depatrment,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, 
+      #{wechat,jdbcType=VARCHAR}, #{department,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, 
       #{telNum,jdbcType=VARCHAR}, #{major,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationContactBook">
@@ -195,8 +195,8 @@
       <if test="wechat != null">
         wechat,
       </if>
-      <if test="depatrment != null">
-        depatrment,
+      <if test="department != null">
+        department,
       </if>
       <if test="position != null">
         position,
@@ -236,8 +236,8 @@
       <if test="wechat != null">
         #{wechat,jdbcType=VARCHAR},
       </if>
-      <if test="depatrment != null">
-        #{depatrment,jdbcType=VARCHAR},
+      <if test="department != null">
+        #{department,jdbcType=VARCHAR},
       </if>
       <if test="position != null">
         #{position,jdbcType=VARCHAR},
@@ -296,8 +296,8 @@
       <if test="record.wechat != null">
         wechat = #{record.wechat,jdbcType=VARCHAR},
       </if>
-      <if test="record.depatrment != null">
-        depatrment = #{record.depatrment,jdbcType=VARCHAR},
+      <if test="record.department != null">
+        department = #{record.department,jdbcType=VARCHAR},
       </if>
       <if test="record.position != null">
         position = #{record.position,jdbcType=VARCHAR},
@@ -331,7 +331,7 @@
       email = #{record.email,jdbcType=VARCHAR},
       qq = #{record.qq,jdbcType=VARCHAR},
       wechat = #{record.wechat,jdbcType=VARCHAR},
-      depatrment = #{record.depatrment,jdbcType=VARCHAR},
+      department = #{record.department,jdbcType=VARCHAR},
       position = #{record.position,jdbcType=VARCHAR},
       tel_num = #{record.telNum,jdbcType=VARCHAR},
       major = #{record.major,jdbcType=INTEGER},
@@ -369,9 +369,7 @@
       <if test="wechat != null">
         wechat = #{wechat,jdbcType=VARCHAR},
       </if>
-      <if test="depatrment != null">
-        depatrment = #{depatrment,jdbcType=VARCHAR},
-      </if>
+      <if test="department != null">department</if>
       <if test="position != null">
         position = #{position,jdbcType=VARCHAR},
       </if>
@@ -401,7 +399,7 @@
       email = #{email,jdbcType=VARCHAR},
       qq = #{qq,jdbcType=VARCHAR},
       wechat = #{wechat,jdbcType=VARCHAR},
-      depatrment = #{depatrment,jdbcType=VARCHAR},
+      department = #{department,jdbcType=VARCHAR},
       position = #{position,jdbcType=VARCHAR},
       tel_num = #{telNum,jdbcType=VARCHAR},
       major = #{major,jdbcType=INTEGER},

+ 2 - 2
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -840,12 +840,12 @@
 	</select>
 	
 	<select id="findCustomerContacts" parameterType="java.lang.String" resultType="com.goafanti.common.model.OrganizationContactBook">
-		select id,name,mobile,email,qq,wechat,depatrment,position,major from organization_contact_book
+		select id,name,mobile,email,qq,wechat,department,position,major from organization_contact_book
 		where uid = #{uid,jdbcType=VARCHAR} and aid = #{aid,jdbcType=VARCHAR}
 	</select>
 	
 	<select id="findAllContacts" parameterType="java.lang.String" resultType="com.goafanti.common.model.OrganizationContactBook">
-		select id,name,mobile,major,sex,depatrment,position,wechat,qq from organization_contact_book  
+		select id,name,mobile,major,sex,department,position,wechat,qq from organization_contact_book  
 		where uid = #{uid,jdbcType=VARCHAR}
 	</select>
 	

+ 10 - 10
src/main/java/com/goafanti/common/model/OrganizationContactBook.java

@@ -43,10 +43,10 @@ public class OrganizationContactBook {
 	 */
 	private String wechat;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.depatrment
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.department
 	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
 	 */
-	private String depatrment;
+	private String department;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_contact_book.position
 	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
@@ -213,21 +213,21 @@ public class OrganizationContactBook {
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.depatrment
-	 * @return  the value of organization_contact_book.depatrment
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_contact_book.department
+	 * @return  the value of organization_contact_book.department
 	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
 	 */
-	public String getDepatrment() {
-		return depatrment;
+	public String getDepartment() {
+		return department;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.depatrment
-	 * @param depatrment  the value for organization_contact_book.depatrment
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_contact_book.department
+	 * @param department  the value for organization_contact_book.department
 	 * @mbg.generated  Sun Nov 19 20:34:03 CST 2017
 	 */
-	public void setDepatrment(String depatrment) {
-		this.depatrment = depatrment;
+	public void setDepartment(String department) {
+		this.department = department;
 	}
 
 	/**

+ 28 - 28
src/main/java/com/goafanti/common/model/OrganizationContactBookExample.java

@@ -722,73 +722,73 @@ public class OrganizationContactBookExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentIsNull() {
-			addCriterion("depatrment is null");
+		public Criteria andDepartmentIsNull() {
+			addCriterion("department is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentIsNotNull() {
-			addCriterion("depatrment is not null");
+		public Criteria andDepartmentIsNotNull() {
+			addCriterion("department is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentEqualTo(String value) {
-			addCriterion("depatrment =", value, "depatrment");
+		public Criteria andDepartmentEqualTo(String value) {
+			addCriterion("department =", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentNotEqualTo(String value) {
-			addCriterion("depatrment <>", value, "depatrment");
+		public Criteria andDepartmentNotEqualTo(String value) {
+			addCriterion("department <>", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentGreaterThan(String value) {
-			addCriterion("depatrment >", value, "depatrment");
+		public Criteria andDepartmentGreaterThan(String value) {
+			addCriterion("department >", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentGreaterThanOrEqualTo(String value) {
-			addCriterion("depatrment >=", value, "depatrment");
+		public Criteria andDepartmentGreaterThanOrEqualTo(String value) {
+			addCriterion("department >=", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentLessThan(String value) {
-			addCriterion("depatrment <", value, "depatrment");
+		public Criteria andDepartmentLessThan(String value) {
+			addCriterion("department <", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentLessThanOrEqualTo(String value) {
-			addCriterion("depatrment <=", value, "depatrment");
+		public Criteria andDepartmentLessThanOrEqualTo(String value) {
+			addCriterion("department <=", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentLike(String value) {
-			addCriterion("depatrment like", value, "depatrment");
+		public Criteria andDepartmentLike(String value) {
+			addCriterion("department like", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentNotLike(String value) {
-			addCriterion("depatrment not like", value, "depatrment");
+		public Criteria andDepartmentNotLike(String value) {
+			addCriterion("department not like", value, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentIn(List<String> values) {
-			addCriterion("depatrment in", values, "depatrment");
+		public Criteria andDepartmentIn(List<String> values) {
+			addCriterion("department in", values, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentNotIn(List<String> values) {
-			addCriterion("depatrment not in", values, "depatrment");
+		public Criteria andDepartmentNotIn(List<String> values) {
+			addCriterion("department not in", values, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentBetween(String value1, String value2) {
-			addCriterion("depatrment between", value1, value2, "depatrment");
+		public Criteria andDepartmentBetween(String value1, String value2) {
+			addCriterion("department between", value1, value2, "department");
 			return (Criteria) this;
 		}
 
-		public Criteria andDepatrmentNotBetween(String value1, String value2) {
-			addCriterion("depatrment not between", value1, value2, "depatrment");
+		public Criteria andDepartmentNotBetween(String value1, String value2) {
+			addCriterion("department not between", value1, value2, "department");
 			return (Criteria) this;
 		}
 

+ 1 - 1
src/main/java/com/goafanti/permission/service/NewRoleService.java

@@ -5,7 +5,7 @@ package com.goafanti.permission.service;
 import java.util.List;
 import java.util.Set;
 
-import com.goafanti.common.enums.roleResources;
+
 import com.goafanti.common.model.Role;
 import com.goafanti.common.model.RoleResources;
 import com.goafanti.core.mybatis.page.Pagination;