Merge branch '1.0' of http://gogs.tcmbrain.com/zjh/pre_paramater into 1.0

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysAppMapper.xml

@@ -68,13 +68,13 @@
             <if test="appDesc != null and appDesc!=''">
                 app_desc = #{ appDesc },
             </if>
-            <if test="updateTime != null and updateTime!=''">
+            <if test="updateTime != null">
                 update_date = #{updateTime},
             </if>
-            <if test="updateUser != null and updateUser!=''">
+            <if test="updateUser != null">
                 update_user = #{updateUser},
             </if>
-            <if test="updateUserName != null and updateUserName!=''">
+            <if test="updateUserName != null">
                 update_user_name = #{updateUserName},
             </if>
             <if test="status != null and status!=''">

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysDepartmentMapper.xml

@@ -36,7 +36,7 @@
 
     <sql id="Base_Column_List">
         dept_id
-        ,dept_name,APP_ID,INS_CODE,dept_origin_id,dept_parent_id,dept_parent_name,CREATE_DATE,CREATE_USER,create_user_name,updateTime,updateUser,updateUserName,status,dept_type
+        ,dept_name,APP_ID,INS_CODE,dept_origin_id,dept_parent_id,dept_parent_name,CREATE_DATE,CREATE_USER,create_user_name,update_date,update_user,update_user_name,status,dept_type
     </sql>
 
     <delete id="deleteByPrimaryKey" parameterType="SysDepartment">
@@ -79,34 +79,34 @@
             <if test="deptName != null and deptName!=''">
                 dept_name = #{ deptName },
             </if>
-            <if test="appId != null appId!=''">
+            <if test="appId != null and appId!=''">
                 APP_ID = #{ appId },
             </if>
-            <if test="insCode != null insCode!=''">
+            <if test="insCode != null and insCode!=''">
                 INS_CODE = #{ insCode },
             </if>
-            <if test="depOriginId != null depOriginId!=''">
+            <if test="depOriginId != null and depOriginId!=''">
                 dept_origin_id = #{ depOriginId },
             </if>
-            <if test="depParentId != null depParentId!=''">
+            <if test="depParentId != null and depParentId!=''">
                 dept_parent_id = #{ depParentId },
             </if>
-            <if test="depParentName != null depParentName!=''">
+            <if test="depParentName != null and depParentName!=''">
                 dept_parent_name = #{ depParentName },
             </if>
-            <if test="updateTime != null updateTime!=''">
+            <if test="updateTime != null">
                 update_date = #{updateTime},
             </if>
-            <if test="updateUser != null updateUser!=''">
+            <if test="updateUser != null and updateUser!=''">
                 update_user = #{updateUser},
             </if>
-            <if test="updateUserName != null updateUserName!=''">
+            <if test="updateUserName != null and updateUserName!=''">
                 update_user_name = #{updateUserName},
             </if>
-            <if test="status != null status!=''">
+            <if test="status != null and status!=''">
                 status = #{ status },
             </if>
-            <if test="deptType != null deptType!=''">
+            <if test="deptType != null and deptType!=''">
                 dept_type = #{deptType},
             </if>
         </set>

cbkj_web_parameter/src/main/resources/mappers/sysApp/SysInstitutionMapper.xml

@@ -462,6 +462,9 @@
         order by SORT, INS_CODE
 
     </select>
+    <select id="getSysInstitutionByInsCode"  parameterType="string" resultMap="BaseResultMap">
+        select  <include refid="Base_Column_List"/> from sys_institution where INS_CODE=#{insCode}
+    </select>
     <update id="updateByIns" parameterType="SysInstitution">
         update sys_institution
         <set>