Merge branch 'master' of ssh://git@dev.33.cn/maamin1/sqLogisticsProject.git

saicLogistics/src/main/java/com/fuzamei/mapper/UserMapper.xml

@@ -83,7 +83,7 @@
 	
 	<!--参数类型为1001,1002,1003等， 批量删除 -->
 	<delete id="deleteFromUserId" parameterType="string">
-		delete  from   users   where  user_id in (userids)
+		delete  from   users   where  user_id in 
 		<foreach item="userids" collection="array" open="(" separator="," close=")">
             #{userids}
         </foreach>
@@ -115,7 +115,7 @@
 		insert into  
 		           operation_history_admin(operator_id,operation_type_id,be_operated_id,operation_time,hash)
 		    values
-		    <foreach collection="#{userIdbs}" separator="," item="userIdb">
+		    <foreach collection="userIdbs" separator="," item="userIdb">
 		    	(#{userId},#{operationTypeId},#{userIdb},#{operationTime},#{hash})
 		    </foreach>
 	</insert>

saicLogistics/src/main/java/com/fuzamei/web/UserAction.java

@@ -212,7 +212,6 @@ public class UserAction {
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);
 		}
-
 	} 
 
 }