Merge branch 'remould_1210_icon_diff'

app/controllers/admin/forumUser.js

@@ -37,7 +37,12 @@ router.post('/user/updateByUid', function(req, res, next) {
 		    entity.icon = icon;
 		}
 
-		forumUserService.updateUserByUIdAndEntCode(uid,ent_code,entity,function(err,result){
+		var str_uid = uid+"";
+		var condition = {
+			$or : [{uid: str_uid},{uid:uid }],
+			ent_code:ent_code
+		};
+		forumUserService.updateUserByUIdAndEntCode(condition,entity,function(err,result){
 			if(err){
 				res.json(returnCode.BUSY);
 			}else{

app/service/forumUserService.js

@@ -199,11 +199,8 @@ exports.searchMembersAndLimitActions=function(pageNo, pageSize, q, callback){
 
 
 //根据UID和entCode更新用户信息
-exports.updateUserByUIdAndEntCode=function(uid,ent_code,entity,callback){
-	ForumUser.update({
-		uid: uid,
-		ent_code:ent_code
-	}, entity,null,function(err,result){
+exports.updateUserByUIdAndEntCode=function(condition,entity,callback){
+	ForumUser.update(condition, entity,null,function(err,result){
 		if (err) {
 			console.error(err);
 			callback(err,null);