git-svn-id: https://192.168.57.71/svn/jsgkj@579 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/RoleModelMapper.java

@@ -1,7 +1,16 @@
 package com.xt.js.gkaq.frame.mappers;
 
+import java.util.List;
+
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.RoleModel;
 
 public interface RoleModelMapper extends BaseMapper<RoleModel> {
+	/**
+	 * ¸ù¾ÝÓû§ID²é½ÇÉ«
+	 * 
+	 * @param userId
+	 * @return
+	 */
+	public List<RoleModel> selectByUserId(String userId);
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/OrgModel.java

@@ -15,6 +15,12 @@ public class OrgModel {
 
     private String code;
 
+    private String szd;
+
+    private String szdName;
+
+    private String state;
+
     public String getId() {
         return id;
     }
@@ -70,4 +76,28 @@ public class OrgModel {
     public void setCode(String code) {
         this.code = code == null ? null : code.trim();
     }
+
+    public String getSzd() {
+        return szd;
+    }
+
+    public void setSzd(String szd) {
+        this.szd = szd == null ? null : szd.trim();
+    }
+
+    public String getSzdName() {
+        return szdName;
+    }
+
+    public void setSzdName(String szdName) {
+        this.szdName = szdName == null ? null : szdName.trim();
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/RoleModel.java

@@ -11,10 +11,6 @@ public class RoleModel {
 
     private String remark;
 
-    private String status;
-
-    private String phone;
-
     private Object createTime;
 
     private Object updateTime;
@@ -55,22 +51,6 @@ public class RoleModel {
         this.remark = remark == null ? null : remark.trim();
     }
 
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status == null ? null : status.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
     public Object getCreateTime() {
         return createTime;
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/RoleService.java

@@ -1,5 +1,7 @@
 package com.xt.js.gkaq.frame.service;
 
+import java.util.List;
+
 import com.xt.js.gkaq.common.BaseService;
 import com.xt.js.gkaq.frame.model.RoleModel;
 
@@ -10,5 +12,12 @@ import com.xt.js.gkaq.frame.model.RoleModel;
  *
  */
 public interface RoleService extends BaseService<RoleModel> {
+	/**
+	 * ¸ù¾ÝÓû§ID²é½ÇÉ«
+	 * 
+	 * @param userid
+	 * @return
+	 */
+	List<RoleModel> findByUserId(String userid);
 
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/RoleServiceImpl.java

@@ -1,5 +1,7 @@
 package com.xt.js.gkaq.frame.service.impl;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,4 +20,8 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleModel> implements RoleS
 	protected BaseMapper<RoleModel> getMapper() {
 		return mapper;
 	}
+
+	public List<RoleModel> findByUserId(String userId) {
+		return mapper.selectByUserId(userId);
+	}
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/system/FrameConsts.java

@@ -0,0 +1,12 @@
+package com.xt.js.gkaq.frame.system;
+
+/**
+ * 框架包常量
+ * 
+ * @author 袁晓冬
+ *
+ */
+public interface FrameConsts {
+	/** session中存储授权信息的key值 */
+	String SESSION_KEY_AUTH = "__AUTH";
+}

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/GroupModelMapper.xml

@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.xt.js.gkaq.frame.mappers.GroupModelMapper" >
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.GroupModel" >
-    <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="ORG" property="org" jdbcType="VARCHAR" />
-    <result column="ROLE" property="role" jdbcType="VARCHAR" />
-    <result column="REMARK" property="remark" jdbcType="VARCHAR" />
-    <result column="CREATE_TIME" property="createTime" jdbcType="OTHER" />
-    <result column="UPDATE_TIME" property="updateTime" jdbcType="OTHER" />
-    <result column="STATE" property="state" jdbcType="CHAR" />
-  </resultMap>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    delete from AQ_BASIC_FRAME_GROUP
-    where ID = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.GroupModel" >
-    insert into AQ_BASIC_FRAME_GROUP (ID, ORG, ROLE, 
-      REMARK, CREATE_TIME, UPDATE_TIME, 
-      STATE)
-    values (#{id,jdbcType=VARCHAR}, #{org,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=OTHER}, #{updateTime,jdbcType=OTHER}, 
-      #{state,jdbcType=CHAR})
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.GroupModel" >
-    update AQ_BASIC_FRAME_GROUP
-    set ORG = #{org,jdbcType=VARCHAR},
-      ROLE = #{role,jdbcType=VARCHAR},
-      REMARK = #{remark,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=OTHER},
-      UPDATE_TIME = #{updateTime,jdbcType=OTHER},
-      STATE = #{state,jdbcType=CHAR}
-    where ID = #{id,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
-    from AQ_BASIC_FRAME_GROUP
-    where ID = #{id,jdbcType=VARCHAR}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
-    from AQ_BASIC_FRAME_GROUP
-  </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xt.js.gkaq.frame.mappers.GroupModelMapper">
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.GroupModel">
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="ORG" jdbcType="VARCHAR" property="org" />
+    <result column="ROLE" jdbcType="VARCHAR" property="role" />
+    <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+    <result column="CREATE_TIME" jdbcType="OTHER" property="createTime" />
+    <result column="UPDATE_TIME" jdbcType="OTHER" property="updateTime" />
+    <result column="STATE" jdbcType="CHAR" property="state" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from AQ_BASIC_FRAME_GROUP
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.GroupModel">
+    insert into AQ_BASIC_FRAME_GROUP (ID, ORG, ROLE, 
+      REMARK, CREATE_TIME, UPDATE_TIME, 
+      STATE)
+    values (#{id,jdbcType=VARCHAR}, #{org,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=OTHER}, #{updateTime,jdbcType=OTHER}, 
+      #{state,jdbcType=CHAR})
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.GroupModel">
+    update AQ_BASIC_FRAME_GROUP
+    set ORG = #{org,jdbcType=VARCHAR},
+      ROLE = #{role,jdbcType=VARCHAR},
+      REMARK = #{remark,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=OTHER},
+      UPDATE_TIME = #{updateTime,jdbcType=OTHER},
+      STATE = #{state,jdbcType=CHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
+    from AQ_BASIC_FRAME_GROUP
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap">
+    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
+    from AQ_BASIC_FRAME_GROUP
+  </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/OrgModelMapper.xml

@@ -9,6 +9,9 @@
     <result column="PID" property="pid" jdbcType="VARCHAR" />
     <result column="SORTNO" property="sortno" jdbcType="DECIMAL" />
     <result column="CODE" property="code" jdbcType="VARCHAR" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="SZD_NAME" property="szdName" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="CHAR" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_ORG
@@ -17,10 +20,12 @@
   <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.OrgModel" >
     insert into AQ_BASIC_FRAME_ORG (ID, NAME, ORG_TYPE, 
       REMARK, PID, SORTNO, 
-      CODE)
+      CODE, SZD, SZD_NAME, 
+      STATE)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=OTHER}, #{orgType,jdbcType=VARCHAR}, 
       #{remark,jdbcType=OTHER}, #{pid,jdbcType=VARCHAR}, #{sortno,jdbcType=DECIMAL}, 
-      #{code,jdbcType=VARCHAR})
+      #{code,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, #{szdName,jdbcType=VARCHAR}, 
+      #{state,jdbcType=CHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.OrgModel" >
     update AQ_BASIC_FRAME_ORG
@@ -29,16 +34,19 @@
       REMARK = #{remark,jdbcType=OTHER},
       PID = #{pid,jdbcType=VARCHAR},
       SORTNO = #{sortno,jdbcType=DECIMAL},
-      CODE = #{code,jdbcType=VARCHAR}
+      CODE = #{code,jdbcType=VARCHAR},
+      SZD = #{szd,jdbcType=VARCHAR},
+      SZD_NAME = #{szdName,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=CHAR}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE
+    select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE, SZD, SZD_NAME, STATE
     from AQ_BASIC_FRAME_ORG
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE
+    select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE, SZD, SZD_NAME, STATE
     from AQ_BASIC_FRAME_ORG
   </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/RoleModelMapper.xml

@@ -6,8 +6,6 @@
     <result column="NAME" property="name" jdbcType="VARCHAR" />
     <result column="CODE" property="code" jdbcType="VARCHAR" />
     <result column="REMARK" property="remark" jdbcType="VARCHAR" />
-    <result column="STATUS" property="status" jdbcType="CHAR" />
-    <result column="PHONE" property="phone" jdbcType="VARCHAR" />
     <result column="CREATE_TIME" property="createTime" jdbcType="OTHER" />
     <result column="UPDATE_TIME" property="updateTime" jdbcType="OTHER" />
     <result column="STATE" property="state" jdbcType="CHAR" />
@@ -19,21 +17,17 @@
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.RoleModel" >
     insert into AQ_BASIC_FRAME_ROLE (ID, NAME, CODE, 
-      REMARK, STATUS, PHONE, 
-      CREATE_TIME, UPDATE_TIME, STATE, 
-      SORTNO)
+      REMARK, CREATE_TIME, UPDATE_TIME, 
+      STATE, SORTNO)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, #{phone,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=OTHER}, #{updateTime,jdbcType=OTHER}, #{state,jdbcType=CHAR}, 
-      #{sortno,jdbcType=DECIMAL})
+      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=OTHER}, #{updateTime,jdbcType=OTHER}, 
+      #{state,jdbcType=CHAR}, #{sortno,jdbcType=DECIMAL})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.RoleModel" >
     update AQ_BASIC_FRAME_ROLE
     set NAME = #{name,jdbcType=VARCHAR},
       CODE = #{code,jdbcType=VARCHAR},
       REMARK = #{remark,jdbcType=VARCHAR},
-      STATUS = #{status,jdbcType=CHAR},
-      PHONE = #{phone,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=OTHER},
       UPDATE_TIME = #{updateTime,jdbcType=OTHER},
       STATE = #{state,jdbcType=CHAR},
@@ -41,12 +35,21 @@
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, NAME, CODE, REMARK, STATUS, PHONE, CREATE_TIME, UPDATE_TIME, STATE, SORTNO
+    select ID, NAME, CODE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, SORTNO
     from AQ_BASIC_FRAME_ROLE
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, NAME, CODE, REMARK, STATUS, PHONE, CREATE_TIME, UPDATE_TIME, STATE, SORTNO
+    select ID, NAME, CODE, REMARK, CREATE_TIME, UPDATE_TIME, STATE, SORTNO
     from AQ_BASIC_FRAME_ROLE
   </select>
+  <select id="selectByUserId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    SELECT R.ID, R.NAME, R.CODE, R.REMARK, R.CREATE_TIME, R.UPDATE_TIME, R.STATE, R.SORTNO
+    FROM AQ_BASIC_FRAME_ROLE R
+    WHERE EXISTS(
+    SELECT 1 
+    FROM AQ_BASIC_FRAME_USER_GROUP UG JOIN AQ_BASIC_FRAME_GROUP G ON UG.GROUP_ID=G.ID
+    WHERE UG.USER_ID=#{userId,jdbcType=VARCHAR} AND G.ROLE=R.ID AND UG.STATE='1' AND G.STATE='1'
+	)
+  </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/UserGroupModelMapper.xml

@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.xt.js.gkaq.frame.mappers.UserGroupModelMapper" >
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.UserGroupModel" >
-    <id column="ID" property="id" jdbcType="OTHER" />
-    <result column="GROUP_ID" property="groupId" jdbcType="OTHER" />
-    <result column="USER_ID" property="userId" jdbcType="OTHER" />
-    <result column="CREATE_TIME" property="createTime" jdbcType="OTHER" />
-    <result column="UPDATE_TIME" property="updateTime" jdbcType="OTHER" />
-    <result column="STATE" property="state" jdbcType="CHAR" />
-  </resultMap>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Object" >
-    delete from AQ_BASIC_FRAME_USER_GROUP
-    where ID = #{id,jdbcType=OTHER}
-  </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.UserGroupModel" >
-    insert into AQ_BASIC_FRAME_USER_GROUP (ID, GROUP_ID, USER_ID, 
-      CREATE_TIME, UPDATE_TIME, STATE
-      )
-    values (#{id,jdbcType=OTHER}, #{groupId,jdbcType=OTHER}, #{userId,jdbcType=OTHER}, 
-      #{createTime,jdbcType=OTHER}, #{updateTime,jdbcType=OTHER}, #{state,jdbcType=CHAR}
-      )
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.UserGroupModel" >
-    update AQ_BASIC_FRAME_USER_GROUP
-    set GROUP_ID = #{groupId,jdbcType=OTHER},
-      USER_ID = #{userId,jdbcType=OTHER},
-      CREATE_TIME = #{createTime,jdbcType=OTHER},
-      UPDATE_TIME = #{updateTime,jdbcType=OTHER},
-      STATE = #{state,jdbcType=CHAR}
-    where ID = #{id,jdbcType=OTHER}
-  </update>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Object" >
-    select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE
-    from AQ_BASIC_FRAME_USER_GROUP
-    where ID = #{id,jdbcType=OTHER}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE
-    from AQ_BASIC_FRAME_USER_GROUP
-  </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xt.js.gkaq.frame.mappers.UserGroupModelMapper">
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.UserGroupModel">
+    <id column="ID" jdbcType="OTHER" property="id" />
+    <result column="GROUP_ID" jdbcType="OTHER" property="groupId" />
+    <result column="USER_ID" jdbcType="OTHER" property="userId" />
+    <result column="CREATE_TIME" jdbcType="OTHER" property="createTime" />
+    <result column="UPDATE_TIME" jdbcType="OTHER" property="updateTime" />
+    <result column="STATE" jdbcType="CHAR" property="state" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Object">
+    delete from AQ_BASIC_FRAME_USER_GROUP
+    where ID = #{id,jdbcType=OTHER}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.UserGroupModel">
+    insert into AQ_BASIC_FRAME_USER_GROUP (ID, GROUP_ID, USER_ID, 
+      CREATE_TIME, UPDATE_TIME, STATE
+      )
+    values (#{id,jdbcType=OTHER}, #{groupId,jdbcType=OTHER}, #{userId,jdbcType=OTHER}, 
+      #{createTime,jdbcType=OTHER}, #{updateTime,jdbcType=OTHER}, #{state,jdbcType=CHAR}
+      )
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.UserGroupModel">
+    update AQ_BASIC_FRAME_USER_GROUP
+    set GROUP_ID = #{groupId,jdbcType=OTHER},
+      USER_ID = #{userId,jdbcType=OTHER},
+      CREATE_TIME = #{createTime,jdbcType=OTHER},
+      UPDATE_TIME = #{updateTime,jdbcType=OTHER},
+      STATE = #{state,jdbcType=CHAR}
+    where ID = #{id,jdbcType=OTHER}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Object" resultMap="BaseResultMap">
+    select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE
+    from AQ_BASIC_FRAME_USER_GROUP
+    where ID = #{id,jdbcType=OTHER}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap">
+    select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE
+    from AQ_BASIC_FRAME_USER_GROUP
+  </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/UserModelMapper.xml

@@ -13,70 +13,6 @@
     <result column="CREATE_TIME" jdbcType="OTHER" property="createTime" />
     <result column="UPDATE_TIME" jdbcType="OTHER" property="updateTime" />
     <result column="STATE" jdbcType="CHAR" property="state" />
-    <result column="RYLX" jdbcType="CHAR" property="rylx" />
-    <result column="SXSJ" jdbcType="OTHER" property="sxsj" />
-  </resultMap>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from AQ_BASIC_FRAME_USER
-    where ID = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.UserModel">
-    insert into AQ_BASIC_FRAME_USER (ID, REAL_NAME, LOGIN_NAME, 
-      LOGIN_PASSWORD, ORGID, SEX, 
-      PHONE, EMAIL, CREATE_TIME, 
-      UPDATE_TIME, STATE, RYLX, SXSJ
-      )
-    values (#{id,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR}, 
-      #{loginPassword,jdbcType=VARCHAR}, #{orgid,jdbcType=VARCHAR}, #{sex,jdbcType=CHAR}, 
-      #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=OTHER}, 
-      #{updateTime,jdbcType=OTHER}, #{state,jdbcType=CHAR}, #{rylx,jdbcType=CHAR}, #{sxsj,jdbcType=OTHER}
-      )
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.UserModel">
-    update AQ_BASIC_FRAME_USER
-    set REAL_NAME = #{realName,jdbcType=VARCHAR},
-      LOGIN_NAME = #{loginName,jdbcType=VARCHAR},
-      LOGIN_PASSWORD = #{loginPassword,jdbcType=VARCHAR},
-      ORGID = #{orgid,jdbcType=VARCHAR},
-      SEX = #{sex,jdbcType=CHAR},
-      PHONE = #{phone,jdbcType=VARCHAR},
-      EMAIL = #{email,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=OTHER},
-      UPDATE_TIME = #{updateTime,jdbcType=OTHER},
-      STATE = #{state,jdbcType=CHAR},
-      RYLX = #{rylx,jdbcType=CHAR},
-      SXSJ = #{sxsj,jdbcType=OTHER}
-    where ID = #{id,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL, CREATE_TIME, 
-    UPDATE_TIME, STATE, RYLX, SXSJ
-    from AQ_BASIC_FRAME_USER
-    where ID = #{id,jdbcType=VARCHAR}
-  </select>
-  <select id="selectByLoginName" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL, CREATE_TIME, 
-    UPDATE_TIME, STATE, RYLX, SXSJ
-    from AQ_BASIC_FRAME_USER
-    where LOGIN_NAME = #{loginName,jdbcType=VARCHAR}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap">
-    select ID, REAL_NAME, LOGIN_NAME, LOGIN_PASSWORD, ORGID, SEX, PHONE, EMAIL, CREATE_TIME, 
-    UPDATE_TIME, STATE, RYLX, SXSJ
-    from AQ_BASIC_FRAME_USER
-  </select>
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.UserModel">
-    <id column="ID" jdbcType="VARCHAR" property="id" />
-    <result column="REAL_NAME" jdbcType="VARCHAR" property="realName" />
-    <result column="LOGIN_NAME" jdbcType="VARCHAR" property="loginName" />
-    <result column="LOGIN_PASSWORD" jdbcType="VARCHAR" property="loginPassword" />
-    <result column="ORGID" jdbcType="VARCHAR" property="orgid" />
-    <result column="SEX" jdbcType="CHAR" property="sex" />
-    <result column="PHONE" jdbcType="VARCHAR" property="phone" />
-    <result column="EMAIL" jdbcType="VARCHAR" property="email" />
-    <result column="CREATE_TIME" jdbcType="OTHER" property="createTime" />
-    <result column="UPDATE_TIME" jdbcType="OTHER" property="updateTime" />
-    <result column="STATE" jdbcType="CHAR" property="state" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from AQ_BASIC_FRAME_USER

gkaqv2/trunk/modules/frame/src/main/resources/generatorConfig.xml

@@ -23,9 +23,9 @@
 			<property name="enableSubPackages" value="true" />
 		</javaClientGenerator>
 		<!-- <table tableName="AQ_BASIC_FRAME_USER" domainObjectName="UserModel"></table> -->
-		<!-- <table tableName="AQ_BASIC_FRAME_ROLE" domainObjectName="RoleModel"></table> -->
+		<!-- <table tableName="AQ_BASIC_FRAME_ROLE" domainObjectName="RoleModel"></table>  -->
 		 <!-- <table tableName="AQ_BASIC_FRAME_ORG" domainObjectName="OrgModel"></table> -->
-		 <!-- <table tableName="AQ_BASIC_FRAME_GROUP" domainObjectName="GroupModel"></table> -->
-		 <!-- <table tableName="AQ_BASIC_FRAME_USER_GROUP" domainObjectName="UserGroupModel"></table> -->
+		<!--  <table tableName="AQ_BASIC_FRAME_GROUP" domainObjectName="GroupModel"></table>  -->
+		<!-- <table tableName="AQ_BASIC_FRAME_USER_GROUP" domainObjectName="UserGroupModel"></table>   -->
 	</context>
 </generatorConfiguration>