合并德才-添加返回的用户信息

src/main/java/com/archser/aserver/controller/UserController.java

@@ -7,8 +7,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.inject.Inject;
+import com.archser.aserver.model.Organ;
 import com.archser.aserver.model.User;
 import com.archser.aserver.service.UserService;
 import com.jfinal.core.Controller;
@@ -39,6 +39,15 @@ public class UserController extends Controller {
 		String username = this.getAttr("username");
 		User user = User.dao.template("getUser", username).findFirst();
 		user.remove("password");
+		Organ organ = Organ.dao.findById(user.getOrganId());
+		if (organ != null) {
+			Iterator<Entry<String, Object>> organIterator = organ._getAttrsEntrySet().iterator();
+			Entry<String, Object> organAttr = null;
+			while (organIterator.hasNext()) {
+				organAttr = organIterator.next();
+				user.put("ORGAN_" + organAttr.getKey(), organAttr.getValue());
+			}
+		}
 		this.renderJson(Ret.ok("userInfo", user));
 	}