用户管理功能添加组织树

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

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.model.OrgModel;
 import com.xt.js.gkaq.frame.model.OrgModelDto;
 
 public interface OrgModelMapper extends BaseMapper<OrgModelDto> {
@@ -25,4 +26,6 @@ public interface OrgModelMapper extends BaseMapper<OrgModelDto> {
     List<OrgModelDto> selectAllByCond(OrgModelDto model);
 
     List<ComboBoxDto> selectByCombo();
+
+    List<OrgModel> selectOrgTree();
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.model.OrgModel;
 import com.xt.js.gkaq.frame.model.OrgModelDto;
 
 /**
@@ -25,4 +26,6 @@ public interface OrgService extends BaseUUIDModelService<OrgModelDto> {
     public List<OrgModelDto> findAllByCond(OrgModelDto model);
 
     public List<ComboBoxDto> findByCombo();
+
+    public List<OrgModel> initOrgTree();
 }

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

@@ -9,6 +9,7 @@ import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
 import com.xt.js.gkaq.frame.mappers.OrgModelMapper;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.model.OrgModel;
 import com.xt.js.gkaq.frame.model.OrgModelDto;
 import com.xt.js.gkaq.frame.service.OrgService;
 
@@ -33,4 +34,8 @@ public class OrgServiceImpl extends BaseUUIDModelServiceImpl<OrgModelDto> implem
     public List<ComboBoxDto> findByCombo() {
         return mapper.selectByCombo();
     }
+
+    public List<OrgModel> initOrgTree() {
+        return mapper.selectOrgTree();
+    }
 }

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

@@ -71,6 +71,10 @@
     UPDATE_TIME, XZQH, "LEVEL", CREATE_USER, UPDATE_USER
     from AQ_BASIC_FRAME_ORG
   </select>
+  <select id="selectOrgTree" resultMap="BaseResultMap" >
+    select ID, PID, NAME, CODE, ORG_TYPE, SORTNO
+    from AQ_BASIC_FRAME_ORG
+  </select>
   <select id="selectAllByCond" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.frame.model.OrgModelDto" >
     select C.ID, C.CODE, C.NAME, P.ID PID, P.CODE PCODE, P.NAME PNAME, C.ORG_TYPE, C.SZD, C.SZD_NAME, C.XZQH, C."LEVEL", C.REMARK, C.SORTNO
     from AQ_BASIC_FRAME_ORG C left join AQ_BASIC_FRAME_ORG P on C.PID = P.ID

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

@@ -111,6 +111,9 @@
 		    <if test="loginName != null and loginName != ''">
 		        and LOGIN_NAME like #{loginName,jdbcType=VARCHAR}
 		    </if>
+		    <if test="orgid != null and orgid != ''">
+		        and ORGID = #{orgid,jdbcType=VARCHAR}
+		    </if>
     	</where>
     	order by CREATE_TIME desc
   	</select>