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

@@ -59,32 +59,32 @@
     <update id="updateByPrimaryKey" parameterType="SysApp">
         update sys_app
         <set>
-            <if test="appName != null">
+            <if test="appName != null and appName!=''">
                 app_name = #{ appName },
             </if>
-            <if test="appPwd != null">
+            <if test="appPwd != null and appPwd!=''">
                 app_pwd = #{ appPwd },
             </if>
-            <if test="appDesc != null">
+            <if test="appDesc != null and appDesc!=''">
                 app_desc = #{ appDesc },
             </if>
-            <if test="updateDate != null">
+            <if test="updateDate != null and updateDate!=''">
                 update_date = #{updateDate},
             </if>
-            <if test="updateUser != null">
+            <if test="updateUser != null and updateUser!=''">
                 update_user = #{updateUser},
             </if>
-            <if test="updateUserName != null">
+            <if test="updateUserName != null and updateUserName!=''">
                 update_user_name = #{updateUserName},
             </if>
-            <if test="status != null">
+            <if test="status != null and status!=''">
                 status = #{status},
             </if>
-            <if test="sort != null">
+            <if test="sort != null and sort!=''">
                 sort = #{sort},
             </if>
 
-            <if test="platformCode != null">
+            <if test="platformCode != null and platformCode!=''">
                 platform_code = #{platformCode},
             </if>
 

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

@@ -76,37 +76,37 @@
     <update id="updateByPrimaryKey" parameterType="SysDepartment">
         update sys_department
         <set>
-            <if test="deptName != null">
+            <if test="deptName != null and deptName!=''">
                 dept_name = #{ deptName },
             </if>
-            <if test="appId != null">
+            <if test="appId != null appId!=''">
                 APP_ID = #{ appId },
             </if>
-            <if test="insCode != null">
+            <if test="insCode != null insCode!=''">
                 INS_CODE = #{ insCode },
             </if>
-            <if test="depOriginId != null">
+            <if test="depOriginId != null depOriginId!=''">
                 dept_origin_id = #{ depOriginId },
             </if>
-            <if test="depParentId != null">
+            <if test="depParentId != null depParentId!=''">
                 dept_parent_id = #{ depParentId },
             </if>
-            <if test="depParentName != null">
+            <if test="depParentName != null depParentName!=''">
                 dept_parent_name = #{ depParentName },
             </if>
-            <if test="updateDate != null">
+            <if test="updateDate != null updateDate!=''">
                 update_date = #{updateDate},
             </if>
-            <if test="updateUser != null">
+            <if test="updateUser != null updateUser!=''">
                 update_user = #{updateUser},
             </if>
-            <if test="updateUserName != null">
+            <if test="updateUserName != null updateUserName!=''">
                 update_user_name = #{updateUserName},
             </if>
-            <if test="status != null">
+            <if test="status != null status!=''">
                 status = #{ status },
             </if>
-            <if test="deptType != null">
+            <if test="deptType != null deptType!=''">
                 dept_type = #{deptType},
             </if>
         </set>

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

@@ -117,72 +117,63 @@
     <update id="updateByPrimaryKey" parameterType="SysInstitution">
         update sys_institution
         <set>
-            <if test="appId != null">
+            <if test="appId != null and appId!=''">
                 APP_ID = #{ appId },
             </if>
-            <if test="insCode != null">
+            <if test="insCode != null and insCode!=''">
                 INS_CODE = #{ insCode },
             </if>
-            <if test="insName != null">
+            <if test="insName != null and insName!=''">
                 INS_NAME = #{ insName },
             </if>
-            <if test="insParentCode != null">
+            <if test="insParentCode != null and insParentCode != ''">
                 ins_parent_code = #{ insParentCode },
             </if>
-            <if test="insCategory != null">
+            <if test="insCategory != null and insCategory!=''">
                 INS_CATEGORY = #{ insCategory },
             </if>
-            <if test="insIslast != null">
+            <if test="insIslast != null and insIslast!=''">
                 INS_IS_LAST = #{ insIslast },
             </if>
-            <if test="insPinyin != null">
+            <if test="insPinyin != null and insPinyin!=''">
                 INS_PINYIN = #{ insPinyin },
             </if>
-            <if test="insWubi != null">
+            <if test="insWubi != null and insWubi!=''">
                 INS_WUBI = #{ insWubi },
             </if>
-            <if test="provinceCode != null">
+            <if test="provinceCode != null and provinceCode!=''">
                 province_code = #{ provinceCode },
             </if>
-            <if test="provinceName != null">
+            <if test="provinceName != null and provinceName!=''">
                 province_name = #{ provinceName },
             </if>
-            <if test="cityCode != null">
+            <if test="cityCode != null and cityCode!=''">
                 city_code = #{ cityCode },
             </if>
-            <if test="cityName != null">
+            <if test="cityName != null and cityName!=''">
                 city_name = #{ cityName },
             </if>
-            <if test="areaCode != null">
+            <if test="areaCode != null and areaCode!=''">
                 area_code = #{ areaCode },
             </if>
-            <if test="areaName != null">
+            <if test="areaName != null and areaName!=''">
                 area_name = #{ areaName },
             </if>
-            <if test="streetCode != null">
+            <if test="streetCode != null and streetCode!=''">
                 street_code = #{ streetCode },
             </if>
-            <if test="streetName != null">
+            <if test="streetName != null and streetName!=''">
                 street_name = #{ streetName },
             </if>
-            <if test="insAddress != null">
+            <if test="insAddress != null and insAddress!=''">
                 INS_ADDRESS = #{ insAddress },
             </if>
-            <if test="insIsonline != null">
+            <if test="insIsonline != null and insIsonline!=''">
                 INS_ISONLINE = #{ insIsonline },
             </if>
-            <if test="sort != null">
+            <if test="sort != null and sort!=''">
                 SORT = #{ sort },
             </if>
-            <if test="createDate != null">
-                CREATE_DATE = #{ createDate },
-            </if>
-            <if test="createUser != null">
-                CREATE_USER = #{ createUser },
-            </if>
-            <if test="createUsername != null">
-                create_user_name = #{ createUsername },
-            </if>
 
             <if test="updateDate != null">
                 update_date = #{updateDate},
@@ -190,18 +181,18 @@
             <if test="updateUser != null">
                 update_user = #{updateUser},
             </if>
-            <if test="updateUserName != null">
+            <if test="updateUserName != null and updateUserName!=''">
                 update_user_name = #{updateUserName},
             </if>
 
-            <if test="status != null">
+            <if test="status != null and status!=''">
                 status = #{ status },
             </if>
 
-            <if test="platformCode != null">
+            <if test="platformCode != null and platformCode!=''">
                 platform_code = #{platformCode},
             </if>
-            <if test="insLevel != null">
+            <if test="insLevel != null and insLevel!=''">
                 ins_level = #{insLevel},
             </if>