Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -250,7 +250,7 @@ public class ReportController extends BaseController {
                     html.append("				<td>" + i + "</td>");
                     html.append("				<td>" + (userEntity.getLoginName() == null ? "" : userEntity.getLoginName()) + "</td>");
                     html.append("				<td>" + (userEntity.getName() == null ? "" : userEntity.getName()) + "</td>");
-                    html.append("				<td></td>");
+                    html.append("				<td>" + (userEntity.getDevision() == null ? "" : userEntity.getDevision()) + "</td>");
                     html.append("				<td>" + (userEntity.getMobile() == null ? "" : userEntity.getMobile()) + "</td>");
                     html.append("				<td>" + (userEntity.getRole().getName() == null ? "" : userEntity.getRole().getName()) + "</td>");
                 }
@@ -304,7 +304,7 @@ public class ReportController extends BaseController {
         }
         Page<ReportEntity> page = reportService.getChooseReportPage(new Page<ReportEntity>(request, response), reportEntity);
         User userEntity = new User();
-        Page<User> userPage = reportService.findUserPage(new Page<User>(request, response), userEntity);
+        Page<User> userPage = reportService.findUserPage(new Page<User>(1, 10), userEntity);
         model.addAttribute("page", page);
         model.addAttribute("userPage", userPage);
         model.addAttribute("user", userEntity);

src/main/java/com/ejweb/modules/sys/entity/User.java

@@ -54,6 +54,7 @@ public class User extends DataEntity<User> {
 
 
     private Position position;    //职位
+    private String devision;    //组织
 
     public User() {
         super();
@@ -319,6 +320,14 @@ public class User extends DataEntity<User> {
         this.position = position;
     }
 
+    public String getDevision() {
+        return devision;
+    }
+
+    public void setDevision(String devision) {
+        this.devision = devision;
+    }
+
     /**
      * 用户拥有的角色名称字符串, 多个角色名称用','分隔.
      */

src/main/resources/mappings/modules/report/ReportDao.xml

@@ -222,7 +222,8 @@
         so1.`name` AS "company.name",
         so2.`name` AS "office.name",
         sp.position_name AS "position.name",
-        sr.`name` AS "role.name"
+        sr.`name` AS "role.name",
+        CONCAT(IFNULL(sac.`name`,""),"-",IFNULL(sao.`name`,"")) AS "devision"
         FROM
         ct_bbtc_sys_user su
         LEFT JOIN ct_bbtc_sys_office so1 ON so1.id = su.company_id
@@ -231,6 +232,8 @@
         LEFT JOIN ct_bbtc_sys_position sp ON sp.id = sup.position_id
         LEFT JOIN ct_bbtc_sys_user2role sur ON su.id = sur.user_id
         LEFT JOIN ct_bbtc_sys_role sr ON sr.id = sur.role_id
+        LEFT JOIN ct_bbtc_sys_area sac ON sac.id = so1.area_id
+        LEFT JOIN ct_bbtc_sys_area sao ON sao.id = so2.area_id
         <where>
             1 = 1
             <if test="no != null and no != ''">

src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp

@@ -277,7 +277,7 @@
                             <td>${vs.count}</td>
                             <td>${user.loginName}</td>
                             <td>${user.name}</td>
-                            <td></td>
+                            <td>${user.devision}</td>
                             <td>${user.mobile}</td>
                             <td>${user.role.name}</td>
                         </tr>