백앤드 수정

wyu

2021-11-09 6f111a79db77890bc448cd46ea080d94039864cf

백앤드 수정

 src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java

@@ -139,9 +139,9 @@
        // code_ko_KR 에 code명 설정
        ExportExcelVo excelInfo = new ExportExcelVo();
        excelInfo.setFileName(this.messageAccessor.message("부서 목록"));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentName", this.messageAccessor.message("departmentManage.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentDescription", this.messageAccessor.message("departmentManage.departmentDescription"), 20, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentCount", this.messageAccessor.message("departmentManage.departmentCount"), 3, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentName", this.messageAccessor.message("department.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentDescription", this.messageAccessor.message("department.departmentDescription"), 20, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentCount", this.messageAccessor.message("department.departmentCount"), 3, ExportExcelAttrVo.ALIGN_CENTER));

        excelInfo.setDatas(departmentVos);


 src/main/java/kr/wisestone/owl/web/condition/DepartmentCondition.java

@@ -16,8 +16,8 @@
    private Integer Page;
    private Integer PageSize;

    public static DepartmentCondition make(Map<String, Object> departmentManageConditions) {
        return ConvertUtil.convertMapToClass(departmentManageConditions, DepartmentCondition.class);
    public static DepartmentCondition make(Map<String, Object> departmentConditions) {
        return ConvertUtil.convertMapToClass(departmentConditions, DepartmentCondition.class);
    }

    public Long getId() {

 src/main/resources/mybatis/query-template/userWorkspace-template.xml

@@ -10,7 +10,6 @@
        u.name as userName,
        u.account as account,
        u.level_id as levelId,
        u.department_id as departmentId,
        CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn
        FROM
        user_workspace uw
@@ -44,16 +43,6 @@
                </foreach>
            </when>
        </choose>

        <choose>
            <when test="departmentIds.size != 0">
                AND u.department_id IN
                <foreach collection="departmentIds" item="item" index="index" separator="," open="(" close=")">
                    #{item}
                </foreach>
            </when>
        </choose>

        limit #{pageSize} offset #{page};
    </select>


 src/main/webapp/WEB-INF/i18n/code_ko_KR.properties

@@ -109,9 +109,9 @@
manageUser.manageFAQPerm=FAQ \uAD00\uB9AC
manageUser.manageQnAPerm=QnA \uAD00\uB9AC
manageUser.manageGuidePerm=\uAC00\uC774\uB4DC \uAD00\uB9AC
departmentManage.departmentName=\uBD80\uC11C\uBA85
departmentManage.departmentDescription=\uBD80\uC11C\uC124\uBA85
departmentManage.departmentCount=\uBD80\uC11C\uC778\uC6D0
department.departmentName=\uBD80\uC11C\uBA85
department.departmentDescription=\uBD80\uC11C\uC124\uBA85
department.departmentCount=\uBD80\uC11C\uC778\uC6D0
companyField.companyName=\uC5C5\uCCB4\uBA85
companyField.companyManager=\uB2F4\uB2F9\uC790
companyField.companyTel=\uC804\uD654\uBC88\uD638